Merge branch 'master' of git://repo.or.cz/rox-filer
commitfec040efe932ee14a78c5df89a5291679dc59237
authorStephen Watson <stephen@kerofin.demon.co.uk>
Wed, 4 Jun 2008 06:20:15 +0000 (4 07:20 +0100)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Wed, 4 Jun 2008 06:20:15 +0000 (4 07:20 +0100)
tree49406647c49fd88cec74a253b33365ceac413404
parent7890e1cc4b169aab33f1d4adcd0416b122490557
parent706edc646107684ada6c7ab9168b8a56ef2d153e
Merge branch 'master' of git://repo.or.cz/rox-filer