Merge pull request #82 from CVC4/master_for_merge
authorguykatzz <katz911@gmail.com>
Wed, 23 Mar 2016 19:12:10 +0000 (12:12 -0700)
committerguykatzz <katz911@gmail.com>
Wed, 23 Mar 2016 19:12:10 +0000 (12:12 -0700)
Squash-merge from the proof branch


Trivial merge