From: Tim King <taking@cs.nyu.edu>
Date: Mon, 12 May 2014 17:10:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'timothy-king/master'
X-Git-Tag: cvc5-1.0.0~6910
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2550b6de915e6937ca145dae68ee04fc58680bce;p=cvc5.git

Merge remote-tracking branch 'timothy-king/master'
---

2550b6de915e6937ca145dae68ee04fc58680bce