Merge branch 'master' of git://repo.or.cz/rox-filer
commitc4d2b5a45ebcd8bb7595fc41884bb08c44e5e95a
authorStephen Watson <stephen@kerofin.demon.co.uk>
Sun, 5 Oct 2008 09:10:06 +0000 (5 10:10 +0100)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Sun, 5 Oct 2008 09:10:06 +0000 (5 10:10 +0100)
tree52822c63879dcf4d3ae188a74b4748f7f5e6d548
parentdc1c76ea64ea7fd680172a678bfeb6ea81b2df8a
parentbfc7ca3da075314f552f7b26a6c3e68f086af4f2
Merge branch 'master' of git://repo.or.cz/rox-filer