Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 3 Dec 2013 19:55:12 +0000 (13:55 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Tue, 3 Dec 2013 19:55:12 +0000 (13:55 -0600)

Trivial merge