Merge branch 'master' of https://github.com/CVC4/CVC4
authorTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 11 Nov 2013 00:48:21 +0000 (18:48 -0600)
committerTianyi Liang <tianyi-liang@uiowa.edu>
Mon, 11 Nov 2013 00:48:21 +0000 (18:48 -0600)

Trivial merge