Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Mon, 20 Jun 2016 21:20:30 +0000 (14:20 -0700)
committerGuy <katz911@gmail.com>
Mon, 20 Jun 2016 21:20:30 +0000 (14:20 -0700)

Trivial merge