From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Mon, 11 Apr 2011 21:45:49 +0000 (-0700)
Subject: Merge branches 'master' and 'master' of http://git.megacz.com/coq-hetmet
X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=commitdiff_plain;h=5e36f25df86a8370a6a47b0ea7bd03a99ca16f29

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