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)
commitc4f976a5c8338042f92da98bc54266ff55652833
tree440036fb1bcf849c589a66729816146d3d73d5d3
parent1cadb3c1034a9a5b0a778b25769ab1a8101de4f1
parente347f43940c53a8dfdaa022bc19900fcee631c08
Merge branch '1.3.x'

Conflicts:
src/theory/arith/normal_form.cpp
src/theory/logic_info.cpp