Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 9 Jan 2014 22:25:34 +0000 (16:25 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 9 Jan 2014 22:25:34 +0000 (16:25 -0600)

Trivial merge