From: Ondřej Surý <ondrej@debian.org>
Date: Wed, 1 Nov 2006 12:14:59 +0000 (+0000)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/1.2.0-1~4
X-Git-Url: http://andersk.mit.edu/gitweb/mod-vhost-ldap.git/commitdiff_plain/7ae041ea40ae3c68b83e4f0d26f83ba5238b5fc3

Merge branch 'upstream'
---

7ae041ea40ae3c68b83e4f0d26f83ba5238b5fc3