projects / mirror / dsa-wiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74d366e 33d155e)
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)
* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  Do not prompt for puppet install
  Add typical expiry time for guest access


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.