From: Mark Hymers <mark@hymers.org.uk>
Date: Wed, 26 Dec 2007 00:37:11 +0000 (+0000)
Subject: Merge shadow branch
X-Git-Tag: userdir-ldap-0.3.16~20^2~2
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=20a7ce0ff4a25931f46e14b2b245859e52674d3e

Merge shadow branch
---

20a7ce0ff4a25931f46e14b2b245859e52674d3e