Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Wed, 8 Jun 2016 22:24:44 +0000 (15:24 -0700)
committerGuy <katz911@gmail.com>
Wed, 8 Jun 2016 22:24:44 +0000 (15:24 -0700)

Trivial merge