Merge branch 'master' of https://github.com/CVC4/CVC4
authorClark Barrett <clarkbarrett@google.com>
Tue, 28 Apr 2015 01:23:54 +0000 (18:23 -0700)
committerClark Barrett <clarkbarrett@google.com>
Tue, 28 Apr 2015 01:23:54 +0000 (18:23 -0700)

Trivial merge