Merge branch '10_fish_whitespace_symlink_issue' into mc-4.6
commit1fd3aa61d62456698dd82ef764615c7f069ce99b
authorPatrick Winnertz <winnie@debian.org>
Mon, 26 Jan 2009 15:55:52 +0000 (26 16:55 +0100)
committerPatrick Winnertz <winnie@debian.org>
Mon, 26 Jan 2009 15:55:52 +0000 (26 16:55 +0100)
tree4aa6e7c2520b6a3efa5970d6b0a2bc4ec8168c2f
parent74dadcc25881b1565a375a869e06ee61a5587a05
parente1572aefd37030a99ef4da0eee110e1cb35058c9
Merge branch '10_fish_whitespace_symlink_issue' into mc-4.6

Conflicts:
ChangeLog
ChangeLog