Merge branch 'master' of git://repo.or.cz/rox-filer
commit284889aa0a4577412ecfe8e3970e7539999d65e0
authorStephen Watson <stephen@kerofin.demon.co.uk>
Tue, 1 Dec 2009 07:08:02 +0000 (1 07:08 +0000)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Tue, 1 Dec 2009 07:08:02 +0000 (1 07:08 +0000)
tree708e4505aefc50ed74fb2376690432f626e6b3be
parent53d3012e7ffd3e08f468c8e3d4a4cc24b0e5309c
parentc1ea3bfec304d16a1f0d98ab24a8328f397fb1f2
Merge branch 'master' of git://repo.or.cz/rox-filer