Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 28 Apr 2014 22:38:56 +0000 (17:38 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 28 Apr 2014 22:38:56 +0000 (17:38 -0500)

Trivial merge