Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 10 Apr 2014 17:57:38 +0000 (12:57 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 10 Apr 2014 17:57:38 +0000 (12:57 -0500)

Trivial merge