Merge branch 'master' of github.com:CVC3/CVC4
authorTim King <taking@cs.nyu.edu>
Wed, 25 Jun 2014 14:46:43 +0000 (10:46 -0400)
committerTim King <taking@cs.nyu.edu>
Wed, 25 Jun 2014 14:46:43 +0000 (10:46 -0400)

Trivial merge