From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Wed, 27 Apr 2011 01:26:49 +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=c503157ee469122213c9ad8deb22ef9e6e487cb5

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

c503157ee469122213c9ad8deb22ef9e6e487cb5