Merge branch 'master' of https://github.com/CVC4/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 26 Dec 2013 00:44:59 +0000 (18:44 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 26 Dec 2013 00:44:59 +0000 (18:44 -0600)

Trivial merge