From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Wed, 23 Jan 2013 22:07:11 +0000 (-0500)
Subject: Merge branch '1.0.x'
X-Git-Tag: cvc5-1.0.0~7454
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3984e0df9dc739259271fd55ba0e814fa7b4fac1;p=cvc5.git

Merge branch '1.0.x'

Conflicts:
	NEWS
---

3984e0df9dc739259271fd55ba0e814fa7b4fac1