Merge branch 'master' of https://github.com/CVC4/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 17 Dec 2013 23:52:40 +0000 (17:52 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 17 Dec 2013 23:52:40 +0000 (17:52 -0600)

Trivial merge