Merge branch 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Wed, 27 Apr 2011 01:26:49 +0000 (18:26 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Wed, 27 Apr 2011 01:26:49 +0000 (18:26 -0700)
commitc503157ee469122213c9ad8deb22ef9e6e487cb5
tree7a9d5c0b3f7ffee37fcfbe417c47132b89a8ba1d
parent1cfe65d4e2d3292cc038882d8518dd7a48e2c40a
parentb6746f7126ffec57776711d57e85e67c25235cc1
Merge branch 'master' of git.megacz.com/coq-hetmet