Merge branch 'master' of https://github.com/CVC4/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 22 Jan 2014 20:08:47 +0000 (14:08 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 22 Jan 2014 20:08:47 +0000 (14:08 -0600)

Trivial merge