Merge branch 'master' of https://github.com/CVC4/CVC4
authorguykatzz <katz911@gmail.com>
Sat, 17 Sep 2016 00:10:51 +0000 (17:10 -0700)
committerguykatzz <katz911@gmail.com>
Sat, 17 Sep 2016 00:10:51 +0000 (17:10 -0700)

Trivial merge