Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 7 Jan 2015 16:03:29 +0000 (10:03 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 7 Jan 2015 16:03:29 +0000 (10:03 -0600)

Trivial merge