Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 27 Dec 2013 17:27:16 +0000 (11:27 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 27 Dec 2013 17:27:16 +0000 (11:27 -0600)

Trivial merge