From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Mon, 31 Oct 2011 05:52:02 +0000 (-0700)
Subject: Merge branch 'master' of http://git.megacz.com/coq-hetmet
X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=commitdiff_plain;h=dadeee86855fd6acf1ba00778fe12c1e425f1842;hp=-c

Merge branch 'master' of git.megacz.com/coq-hetmet
---

dadeee86855fd6acf1ba00778fe12c1e425f1842