Merge branch 'master' of https://github.com/CVC4/CVC4
authorKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 16 Feb 2015 06:54:31 +0000 (01:54 -0500)
committerKshitij Bansal <kshitij@cs.nyu.edu>
Mon, 16 Feb 2015 06:54:31 +0000 (01:54 -0500)

Trivial merge