Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 21 Oct 2013 02:28:09 +0000 (21:28 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 21 Oct 2013 02:28:09 +0000 (21:28 -0500)

Trivial merge