Merge branch 'upstream'
tree2385988367411cd6eb4fd98de5e283511528fed9
drwxr-xr-x - Choices
-rw-r--r-- 2980 README
-rw-r--r-- 3247 README-es
-rw-r--r-- 761 ROX-Filer.xml
drwxr-xr-x - ROX-Filer
-rwxr-xr-x 5816 install.sh
-rw-r--r-- 186 rox.xml