Merge branch 'master' of git://repo.or.cz/rox-filer
commit01187f068128b51c7d943b03046520466e643d8c
authorStephen Watson <stephen@kerofin.demon.co.uk>
Wed, 4 Jun 2008 21:06:09 +0000 (4 22:06 +0100)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Wed, 4 Jun 2008 21:06:09 +0000 (4 22:06 +0100)
treebdab36ebc3ed81a67a6c26943cefb777b10b340e
parentfec040efe932ee14a78c5df89a5291679dc59237
parent437a288e7d8400eeec1f2c9dae04180722fb512c
Merge branch 'master' of git://repo.or.cz/rox-filer