Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Wed, 26 Mar 2014 22:35:33 +0000 (18:35 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Wed, 26 Mar 2014 22:35:33 +0000 (18:35 -0400)
Conflicts:
src/theory/arith/normal_form.cpp

1  2 
src/theory/logic_info.cpp

Simple merge