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