Merge branch 'master' of github.com:CVC4/CVC4
authorMathias Preiner <mathias.preiner@gmail.com>
Sat, 8 Jul 2017 00:11:07 +0000 (17:11 -0700)
committerMathias Preiner <mathias.preiner@gmail.com>
Sat, 8 Jul 2017 00:11:07 +0000 (17:11 -0700)

Trivial merge