From: Clark Barrett <clarkbarrett@google.com>
Date: Thu, 23 Apr 2015 17:45:04 +0000 (-0700)
Subject: Merge branch 'master' into google
X-Git-Tag: cvc5-1.0.0~6344
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f2ff7173d434162d49814ba3f24a9f9db21d476;p=cvc5.git

Merge branch 'master' into google
---

9f2ff7173d434162d49814ba3f24a9f9db21d476