From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 6 Sep 2009 22:39:02 +0000 (+0200)
Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=a3cb873e8729d65c8ff4e1236311d3b5bbc12b3b

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
---

a3cb873e8729d65c8ff4e1236311d3b5bbc12b3b