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

Trivial merge