Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Sat, 18 Jan 2014 17:11:03 +0000 (11:11 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Sat, 18 Jan 2014 17:11:03 +0000 (11:11 -0600)

Trivial merge