Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 13 May 2014 02:03:25 +0000 (21:03 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 13 May 2014 02:03:25 +0000 (21:03 -0500)

Trivial merge