Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Thu, 28 Jul 2016 18:24:59 +0000 (11:24 -0700)
committerGuy <katz911@gmail.com>
Thu, 28 Jul 2016 18:24:59 +0000 (11:24 -0700)

Trivial merge