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

Trivial merge