Merge branch 'master' of https://github.com/CVC4/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 3 Oct 2013 16:17:12 +0000 (11:17 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 3 Oct 2013 16:17:12 +0000 (11:17 -0500)

Trivial merge