Merge branch 'master' of git://repo.or.cz/rox-filer
commit0987f2cc3cda48f04122922edeed4f4ffd32383c
authorStephen Watson <stephen@kerofin.demon.co.uk>
Tue, 22 Jan 2008 07:08:51 +0000 (22 07:08 +0000)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Tue, 22 Jan 2008 07:08:51 +0000 (22 07:08 +0000)
tree9ccc56691060b7a81c56bdb33021dce785f94eec
parented0adb6e4e873eca15b4765035d3c89888c74a72
parent65f8a2b2d719fa3fbe9678fa7debc7e3dda9bd2e
Merge branch 'master' of git://repo.or.cz/rox-filer