Merge branch 'master' of https://github.com/CVC4/CVC4
authorKshitij Bansal <kshitij@cs.nyu.edu>
Wed, 3 Dec 2014 17:09:14 +0000 (12:09 -0500)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Wed, 3 Dec 2014 17:09:14 +0000 (12:09 -0500)

Trivial merge