Merge branch 'master' of git://repo.or.cz/rox-filer
commit53d3012e7ffd3e08f468c8e3d4a4cc24b0e5309c
authorStephen Watson <stephen@kerofin.demon.co.uk>
Sat, 19 Sep 2009 15:31:58 +0000 (19 16:31 +0100)
committerStephen Watson <stephen@kerofin.demon.co.uk>
Sat, 19 Sep 2009 15:31:58 +0000 (19 16:31 +0100)
tree05b671f9a46a1ef0ba0fedf5602510fbcc171d4d
parent75f2092efe820a64b1df85e2c82079baedfc7d68
parentf5f79b848ebf5738c979f75e5e780e7779d82a6a
Merge branch 'master' of git://repo.or.cz/rox-filer