Merge branch 'master' of git://repo.or.cz/rox-filer
commit3f8725025a772eaa099173983584f1a24c5195e8
authorStephen Watson <stephen@kerofin.demon.co.uk>
Mon, 3 Dec 2007 18:14:32 +0000 (3 18:14 +0000)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Mon, 3 Dec 2007 18:14:32 +0000 (3 18:14 +0000)
tree7669fb9b7be0464a47561dbb28c0e2294edce988
parentef89e8f34f31c8a4797ae32dcd132a98c3dadff8
parente121d8e59e8a867d15a71f7e0d6092272c0b0699
Merge branch 'master' of git://repo.or.cz/rox-filer