Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 22 Dec 2014 22:24:08 +0000 (16:24 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 22 Dec 2014 22:24:08 +0000 (16:24 -0600)

Trivial merge