Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Tue, 26 Jul 2016 22:03:37 +0000 (15:03 -0700)
committerGuy <katz911@gmail.com>
Tue, 26 Jul 2016 22:03:37 +0000 (15:03 -0700)

Trivial merge