Merge branch 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Mon, 31 Oct 2011 05:52:02 +0000 (22:52 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Mon, 31 Oct 2011 05:52:02 +0000 (22:52 -0700)
commitdadeee86855fd6acf1ba00778fe12c1e425f1842
tree113b120427137843d051ddec9ec52b64e3a16540
parenta2cbba71fc8af854b34dcf348392897504ad41b2
parent2b7abc4857605fec500dac5242280c82dbfee883
Merge branch 'master' of git.megacz.com/coq-hetmet