From: Martin Zobel-Helas <zobel@debian.org>
Date: Tue, 16 Apr 2013 21:59:28 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=890db3e105a91e018ed2fa1f5e3f4ce74861b066

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Do not prompt for puppet install
  Add typical expiry time for guest access
---

890db3e105a91e018ed2fa1f5e3f4ce74861b066