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