Merge branch 'master' of git://repo.or.cz/rox-filer
commit9261b76cac51d51c9c6030f090a831b2c1f8d6f0
authorStephen Watson <stephen@kerofin.demon.co.uk>
Mon, 14 Apr 2008 06:10:00 +0000 (14 07:10 +0100)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Mon, 14 Apr 2008 06:10:00 +0000 (14 07:10 +0100)
treec600d24140b39263679d2c5b36927cf137da6643
parentbbc68dcadd53c5ead4d29fe43488e2f4345dd52c
parent230cec3e2006c6f90cceed2de1aec99dd63dbb23
Merge branch 'master' of git://repo.or.cz/rox-filer