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