Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 26 Feb 2014 17:44:51 +0000 (11:44 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 26 Feb 2014 17:44:51 +0000 (11:44 -0600)

Trivial merge