Merge branch 'master' of https://github.com/CVC4/CVC4
authorlianah <lianahady@gmail.com>
Thu, 12 Jun 2014 19:18:47 +0000 (15:18 -0400)
committerlianah <lianahady@gmail.com>
Thu, 12 Jun 2014 19:18:47 +0000 (15:18 -0400)

Trivial merge