Merge branch 'master' of https://github.com/CVC4/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 28 Jul 2015 01:19:35 +0000 (20:19 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 28 Jul 2015 01:19:35 +0000 (20:19 -0500)

Trivial merge