Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Tue, 26 Jul 2016 23:38:06 +0000 (16:38 -0700)
committerGuy <katz911@gmail.com>
Tue, 26 Jul 2016 23:38:06 +0000 (16:38 -0700)

Trivial merge