Merge branch 'christian' of git://repo.or.cz/git-cheetah
commit912880741af661cb2ef508e675a728d0eac865d2
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 5 Feb 2009 14:23:39 +0000 (5 15:23 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 5 Feb 2009 14:23:39 +0000 (5 15:23 +0100)
tree8d05c6b40674e0cf8ab1178cf026d95dc52415bf
parentd2741ad14399fda65d8c32a1b2ed512952d54733
parent91769f7d48691ee33eff2bec84faa214045893d3
Merge branch 'christian' of git://repo.or.cz/git-cheetah