From: Kshitij Bansal <kshitij@cs.nyu.edu>
Date: Mon, 28 Apr 2014 23:11:59 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master' into sets
X-Git-Tag: cvc5-1.0.0~6953
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b67bac1b0088fefb1dfc14407e76968bd163b3f;p=cvc5.git

Merge remote-tracking branch 'upstream/master' into sets
---

6b67bac1b0088fefb1dfc14407e76968bd163b3f