Merge branch 'master' of git://repo.or.cz/rox-filer
commit38fb7facf41e527c6ea8cd4a42869b54927243f0
authorStephen Watson <stephen@kerofin.demon.co.uk>
Sat, 18 Jul 2009 15:30:51 +0000 (18 16:30 +0100)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Sat, 18 Jul 2009 15:30:51 +0000 (18 16:30 +0100)
tree5323dfabd631501e0adcd5175827a9b654e8a269
parent281e1ce04fa99f1a7f4a2f74cf9707ac25fc8355
parent5da5bc3c002c24ea84815ae54e9e180e0c6dae9e
Merge branch 'master' of git://repo.or.cz/rox-filer