Merge branch 'master' of https://github.com/CVC4/CVC4
authorlianah <lianahady@gmail.com>
Thu, 12 Jun 2014 19:18:47 +0000 (15:18 -0400)
committerlianah <lianahady@gmail.com>
Thu, 12 Jun 2014 19:18:47 +0000 (15:18 -0400)
commitd9f5d514a99d3fe1f4b9b7c0fe6a25ac0ec4dbcc
treeff73409c911b102a1f691baf25a776c8c593c1c6
parent47224a4596a4131a260d9dd9ceec8e55ede0aad3
parented402af3aaf578a55df6fa225b7b7a5455486a05
Merge branch 'master' of https://github.com/CVC4/CVC4