From: Mark Hymers <mark@hymers.org.uk>
Date: Wed, 26 Dec 2007 22:47:26 +0000 (+0000)
Subject: merge from upstream
X-Git-Tag: userdir-ldap-0.3.16~15^2
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6bd0655ce94ed67ace68aa9b27ecaea2186a1d11;hp=dc2644ca6761003bc2ede1d8c92235096b11c6fb;p=mirror%2Fuserdir-ldap.git

merge from upstream
---