Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 7 Mar 2014 21:04:09 +0000 (15:04 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 7 Mar 2014 21:04:09 +0000 (15:04 -0600)

Trivial merge