projects / mirror / dsa-wiki.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1402cc3 288ac22)
Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki
authorPeter Palfrader <peter@palfrader.org>
Mon, 11 Apr 2011 17:52:48 +0000 (19:52 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 11 Apr 2011 17:52:48 +0000 (19:52 +0200)
commit363461e7838662d58cd970882be6f318158a2a0f
treecf798e7ca4f56ec37241a096167208c28f6f1935tree | snapshot
parent1402cc37c71b8efd3357ac864fbdc440d6bb5aa7commit | diff
parent288ac22b786ab9e60b7a46056826e228b32e6efdcommit | diff
Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  a dep on the unbound package from the dir means we only need to run puppet twice now
  document how to stop buildds Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  init scripts like arguments, like... start Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
Unnamed repository; edit this file 'description' to name the repository.