Merge branch '1.0.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 5 Mar 2013 22:49:25 +0000 (17:49 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 5 Mar 2013 22:49:25 +0000 (17:49 -0500)
commit66b99ac64a6920787905948315e74ca1c5b3e90b
tree74df474faa96cdc6fdaf67ff5f95e8cdb31c4f02
parentc921b7a9ab231c3eeca426644fb815e8062e18e3
parent8eb02754af2dbef5b3704d6674e8b7376f07f8a1
Merge branch '1.0.x'

Conflicts:
src/smt/smt_engine.cpp
src/smt/smt_engine.cpp