From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 13 Jan 2013 19:36:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/openldap-improvements'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4b037c77c4eed4f22ca89f4a5eae3009d6479e3;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/openldap-improvements'
---

e4b037c77c4eed4f22ca89f4a5eae3009d6479e3