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

Trivial merge