Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 17 Mar 2014 18:22:21 +0000 (13:22 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 17 Mar 2014 18:22:21 +0000 (13:22 -0500)

Trivial merge