Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 27 Sep 2013 14:26:57 +0000 (09:26 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Fri, 27 Sep 2013 14:26:57 +0000 (09:26 -0500)

Trivial merge