Merge branch 'master' of rpeng@enigma.biostat.jhsph.edu:gitrepos/filehash
commit0fd7742a2b897971ea2e1c4f311b11489d0d64da
authorRoger D. Peng [powerbook] <rpeng@jhsph.edu>
Fri, 7 Sep 2007 11:46:26 +0000 (7 07:46 -0400)
committerRoger D. Peng [powerbook] <rpeng@jhsph.edu>
Fri, 7 Sep 2007 11:46:26 +0000 (7 07:46 -0400)
tree40959a5b4ae702eeb7b380f438e6d474dbf1a6e7
parent832fa5324ac6d5e3da5a250f25c53616d80a2a18
parent0ca5bef6a212e3f9585b671cdd5a6b638ecfbce2
Merge branch 'master' of rpeng@enigma.biostat.jhsph.edu:gitrepos/filehash

Conflicts:

DESCRIPTION