Merge branch 'master' of https://github.com/CVC4/CVC4
authorlianah <lianahady@gmail.com>
Wed, 11 Jun 2014 22:40:39 +0000 (18:40 -0400)
committerlianah <lianahady@gmail.com>
Wed, 11 Jun 2014 22:40:39 +0000 (18:40 -0400)

Trivial merge