Merge branch 'master' of https://github.com/CVC4/CVC4
authorGuy <katz911@gmail.com>
Thu, 24 Mar 2016 23:56:31 +0000 (16:56 -0700)
committerGuy <katz911@gmail.com>
Thu, 24 Mar 2016 23:56:31 +0000 (16:56 -0700)

Trivial merge