From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 10 Jan 2008 14:53:20 +0000 (+0100)
Subject: Remerge merge or whatever
X-Git-Tag: userdir-ldap-0.3.16~10
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=24dee703384d8f79c69c79c10b6879664d6b8677;hp=5cc5918ba2bb2b4d5aac3a45ada34c6d7c5b89b2;p=mirror%2Fuserdir-ldap.git

Remerge merge or whatever
---