Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 26 Mar 2014 22:31:23 +0000 (17:31 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 26 Mar 2014 22:31:23 +0000 (17:31 -0500)

Trivial merge