Merge branch 'master' of git://repo.or.cz/rox-filer
commitb8c1f8387ccb72ea211fa996b03a51ded4f95a3f
authorStephen Watson <stephen@kerofin.demon.co.uk>
Thu, 22 Nov 2007 18:51:00 +0000 (22 18:51 +0000)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Thu, 22 Nov 2007 18:51:00 +0000 (22 18:51 +0000)
tree14b22423331332be691fdeca06678ac8c68f6f69
parentd679815ff9c0312de12d175bfdab7c4b5f27a22b
parent04e299d980efb11b64bb1746aef243e97ed6c546
Merge branch 'master' of git://repo.or.cz/rox-filer