Merge branch '1.4.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Mon, 6 Oct 2014 18:27:26 +0000 (14:27 -0400)
committerMorgan Deters <mdeters@cs.nyu.edu>
Mon, 6 Oct 2014 18:27:26 +0000 (14:27 -0400)
commit865ee1c6986d9a2e8729bcfcde98a4ea09eb4886
tree3575bbca35b0d271c93d7038e50c1adf10ae1bce
parent5738d3d2f9e917829156e678cbf317f3a1a37c9a
parent627628cd06fc5b19fe59c95b3cb4073d85a8dfab
Merge branch '1.4.x'

Conflicts:
test/regress/regress0/arrays/Makefile.am
src/parser/cvc/Cvc.g
test/regress/regress0/Makefile.am
test/regress/regress0/arrays/Makefile.am