projects / mirror / dsa-wiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 480869a 4a848b2)
Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki
authorPeter Palfrader <peter@palfrader.org>
Sun, 6 Sep 2009 22:39:02 +0000 (00:39 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 6 Sep 2009 22:39:02 +0000 (00:39 +0200)
* 'master' of ssh://db.debian.org/git/dsa-wiki:
  sshd config comes from puppet
  LDAP host entries are more important now


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