Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Wed, 8 Jan 2014 20:32:59 +0000 (15:32 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Wed, 8 Jan 2014 20:32:59 +0000 (15:32 -0500)
commite6fb65b8a960db1e4a21d7414f3270f03a474384
tree78c4c7ead119c05fe8f03a808679bac560b47ee0
parent9e376ab6c826c951a0c9e1bf3d07a902249b34fd
parent312918e68d4410359b55258dc2b9e9cdfb21f211
Merge branch '1.3.x'

Conflicts:
COPYING
NEWS
config/cvc4.m4
.travis.yml
COPYING
NEWS
config/cvc4.m4
configure.ac