Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Sat, 1 Mar 2014 04:59:25 +0000 (22:59 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Sat, 1 Mar 2014 04:59:25 +0000 (22:59 -0600)

Trivial merge