Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Mar 2014 21:54:15 +0000 (17:54 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 11 Mar 2014 21:54:15 +0000 (17:54 -0400)
1  2 
src/smt/options

diff --cc src/smt/options
Simple merge