Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 16 Apr 2013 21:59:28 +0000 (23:59 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 16 Apr 2013 21:59:28 +0000 (23:59 +0200)
commit890db3e105a91e018ed2fa1f5e3f4ce74861b066
tree9e9f90a4aac21396a1620c2f48808ee065171c4a
parent74d366e3e9c853ddb9f6471997cbdabc0b1f21a6
parent33d155e1115b416bef6a6eab10ccd494a5baaaa8
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