Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 6 Feb 2015 00:29:06 +0000 (18:29 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 6 Feb 2015 00:29:06 +0000 (18:29 -0600)

Trivial merge