Merge branch 'master' of http://kerofin.demon.co.uk/~stephen/git/rox-filer
tree09d3e49db82705c762d931fa8e2c9e0bd1d2d5d1
drwxr-xr-x - Choices
-rw-r--r-- 1332 README
-rw-r--r-- 3247 README-es
-rw-r--r-- 1625 ROX-Filer.xml
drwxr-xr-x - ROX-Filer
-rw-r--r-- 186 rox.xml