Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 21 Nov 2013 18:39:36 +0000 (12:39 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Thu, 21 Nov 2013 18:39:36 +0000 (12:39 -0600)

Trivial merge