Merge branch 'master' of github.com:tiliang/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 10 Mar 2014 16:54:02 +0000 (11:54 -0500)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 10 Mar 2014 16:54:02 +0000 (11:54 -0500)

Trivial merge