Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 4 Dec 2013 04:55:57 +0000 (22:55 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Wed, 4 Dec 2013 04:55:57 +0000 (22:55 -0600)

Trivial merge