projects / mirror / dsa-wiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* '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>


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