Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 7 May 2014 19:45:57 +0000 (14:45 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 7 May 2014 19:45:57 +0000 (14:45 -0500)

Trivial merge