Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 24 Jan 2014 21:40:34 +0000 (15:40 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 24 Jan 2014 21:40:34 +0000 (15:40 -0600)

Trivial merge