Merge branch 'master' of git://repo.or.cz/rox-filermaster
treebba9701ae859fc20e1f6f628f417224a11ee7c01
-rw-r--r-- 69 .gitignore
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