Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Thu, 14 Apr 2016 23:05:25 +0000 (16:05 -0700)
committerGuy <katz911@gmail.com>
Thu, 14 Apr 2016 23:05:25 +0000 (16:05 -0700)

Trivial merge