Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Sat, 6 Dec 2014 19:26:39 +0000 (13:26 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Sat, 6 Dec 2014 19:26:39 +0000 (13:26 -0600)

Trivial merge