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