From: Mark Hymers <mark@hymers.org.uk>
Date: Thu, 27 Dec 2007 12:50:36 +0000 (+0000)
Subject: merge
X-Git-Tag: userdir-ldap-0.3.16~14^2
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=3a6b6e1ce0ce91574e205b08e9b18d56d0e33683

merge
---

3a6b6e1ce0ce91574e205b08e9b18d56d0e33683