Merge branches 'master' and 'master' of http://git.megacz.com/coq-hetmet
authorAdam Megacz <megacz@cs.berkeley.edu>
Mon, 11 Apr 2011 21:45:49 +0000 (14:45 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Mon, 11 Apr 2011 21:45:49 +0000 (14:45 -0700)
commit5e36f25df86a8370a6a47b0ea7bd03a99ca16f29
treefa41607998b85a8119142297740c39fd8b3dc78f
parente539b49ae3148ab1967b5ea0709734171180b86d
Merge branches 'master' and 'master' of git.megacz.com/coq-hetmet