Merge branch 'master' of https://github.com/CVC4/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 18 Dec 2013 02:17:12 +0000 (20:17 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 18 Dec 2013 02:17:12 +0000 (20:17 -0600)
commit49b8468cfd4921cdc939a1483bbf028f55951744
treec3b2ad31b8548435747748bbcac5133bdba40493
parentc30f459b03572907b06f839535ac4694c0c37b0d
parentc1b9172df7d56eb691aa93c823deb9c65368659e
Merge branch 'master' of https://github.com/CVC4/CVC4