Merge branch 'from-jmcmullan' into develop
authorFrej Drejhammar <frej.drejhammar@gmail.com>
Sat, 20 Dec 2008 18:57:39 +0000 (19:57 +0100)
committerFrej Drejhammar <frej.drejhammar@gmail.com>
Sat, 20 Dec 2008 18:57:39 +0000 (19:57 +0100)
commit276f54c38f12b50c4d44be07e3209d348e348630
tree662ce9028c9edf7596d7e0e47e1989c06a3b643e
parenta984e233c2732c0e82db30d171a76035e08575cc
parentb4833029a44d47b16c12ae3af2acda754e28314f
Merge branch 'from-jmcmullan' into develop

Conflicts:
hg-fast-export.py
hg-fast-export.py
hg-fast-export.sh
hg-reset.py
hg-reset.sh