Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 21:51:26 +0000 (16:51 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Fri, 7 Nov 2014 21:51:26 +0000 (16:51 -0500)
commit86e687cb9566e8623d2e842e383e3a09db609739
treebcce845fd55989703456d25c4f32fc7590a42fa3
parent4ad0191e20e4d812d9a5dc3a733153cb10f6d728
parent6a6630bf6fa4b68c6a483b767be4c696da8fd0bd
Merge branch '1.4.x'

Conflicts:
src/smt/model_postprocessor.cpp
src/smt/boolean_terms.cpp
src/smt/model_postprocessor.cpp