Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 18 Aug 2014 19:53:53 +0000 (15:53 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 18 Aug 2014 19:53:53 +0000 (15:53 -0400)
commit6bebe3957e98e1eba9621b03bfd129a5db441194
treeb91196c35c5310563e7547f7b9ffa3c521d68777
parentfe7a5119d5b48a2546ece43574bc4d07e86c14a7
parentd5e67f7263cd0d44e6f15a64940431f385ef873b
Merge branch '1.4.x'

Conflicts:
test/regress/regress0/Makefile.am
src/parser/smt2/Smt2.g