From: Ondřej Surý <ondrej@debian.org>
Date: Fri, 21 Apr 2006 08:58:17 +0000 (+0000)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.2.0-1~7
X-Git-Url: http://andersk.mit.edu/gitweb/mod-vhost-ldap.git/commitdiff_plain/77709b26bdf71beb3708216500b03ee71b032b6c?hp=-c

Merge branch 'upstream'
---

77709b26bdf71beb3708216500b03ee71b032b6c