Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 12 May 2014 03:14:46 +0000 (22:14 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 12 May 2014 03:14:46 +0000 (22:14 -0500)

Trivial merge