Merge branch '1.3.x'
authorMorgan Deters <mdeters@cs.nyu.edu>
Tue, 24 Dec 2013 18:25:30 +0000 (13:25 -0500)
committerMorgan Deters <mdeters@cs.nyu.edu>
Tue, 24 Dec 2013 18:25:30 +0000 (13:25 -0500)
commita70dfd183b52f50d132d8b17425c7089a77004e7
tree41d783cff1f6097bd76b77c561bbd77111317437
parent371fa29e5742a58581481f3d7d94a8116a814447
parente23a40c0d121209afecff21ce5c6ed6e644bfb0e
Merge branch '1.3.x'

Conflicts:
NEWS
NEWS
src/printer/cvc/cvc_printer.cpp