Merge branch 'master' of https://github.com/CVC4/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 18 Dec 2013 02:17:12 +0000 (20:17 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 18 Dec 2013 02:17:12 +0000 (20:17 -0600)

Trivial merge