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)
commita3cb873e8729d65c8ff4e1236311d3b5bbc12b3b
tree0dc61e5f5ef4d1a1b0a7aa69f56d8609ad330d61
parent480869a0311e4f477ff040c0f1e6f0b62705c7f8
parent4a848b2a9d6d1d29ecfe41cfe7fe84bcba711a2c
Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki

* 'master' of ssh://db.debian.org/git/dsa-wiki:
  sshd config comes from puppet
  LDAP host entries are more important now