Merge branch 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Sun, 27 Mar 2011 19:37:04 +0000 (19:37 +0000)
committerAdam Megacz <megacz@cs.berkeley.edu>
Sun, 27 Mar 2011 19:37:04 +0000 (19:37 +0000)
commit50e3c41de96cf699e3617e702c426b5725173657
tree22d7bce2075027f5d6e278e9d6fd20dcbc71a917
parentd7e72f54b8097cb188e4fc9cb284e585c4d63514
parent9eb30966bc3fdf52921925079331f25de339a36c
Merge branch 'master' of git.megacz.com/coq-hetmet