Merge branch 'master' of git://repo.or.cz/rox-filer
tree3ff2331332803bbf7ef4eb7ad0d134c5259629aa
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