Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 19 Feb 2014 21:23:46 +0000 (15:23 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 19 Feb 2014 21:23:46 +0000 (15:23 -0600)

Trivial merge