Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 26 Nov 2013 20:39:13 +0000 (14:39 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 26 Nov 2013 20:39:13 +0000 (14:39 -0600)

Trivial merge