Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 10 Oct 2013 17:07:40 +0000 (12:07 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 10 Oct 2013 17:07:40 +0000 (12:07 -0500)

Trivial merge