Merge branch 'master' of ssh://ubergit.debian.org/dsa/wiki
drwxr-xr-x - bin
drwxr-xr-x - input
drwxr-xr-x - templates