comparison FTP @ 72891:24025d20791a

Fix previous commit: Remove conflict marker. Undo unification of Pavel Janik's name.
author Reiner Steib <Reiner.Steib@gmx.de>
date Fri, 15 Sep 2006 09:03:48 +0000
parents 6cd56cde7cd4
children 5e1b6a63ac46
comparison
equal deleted inserted replaced
72890:5ba1cd1da822 72891:24025d20791a