From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 10 Jan 2008 14:56:17 +0000 (+0100)
Subject: Merge from alioth
X-Git-Tag: userdir-ldap-0.3.16~7
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=25cb7427f0822d042aed12a16916df64c23854e7;p=mirror%2Fuserdir-ldap.git

Merge from alioth
---

25cb7427f0822d042aed12a16916df64c23854e7