Merge branch 'master' of /git/dsa-wiki

diff --combined bin/update-wiki
index d5ee8e1,3be2046..f671b23
--- 1/bin/update-wiki
--- 2/bin/update-wiki
+++ b/bin/update-wiki
@@@ -3,8 -3,8 +3,8 @@@
  set -e
  umask 0002
  
 -WC="/org/dsa.debian.org/dsa-wiki"
 -DEST="/org/dsa.debian.org/htdocs"
 +WC="/srv/dsa.debian.org/dsa-wiki"
 +DEST="/srv/dsa.debian.org/htdocs"
  URL="http://dsa.debian.org/"
  UPDATE=1
  
@@@ -21,6 -21,8 +21,8 @@@ env -i ikiwiki 
        --templatedir "$WC/templates" \
        --no-discussion \
        --rebuild \
+         --atom \
+         --rss \
        --plugin template \
        --plugin toggle \
        --plugin inline \