From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Mar 2012 09:13:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/openldap'
X-Git-Url: http://git.ipfire.org/?p=people%2Famarx%2Fipfire-3.x.git;a=commitdiff_plain;h=3e76909a2ea734614f2d94616ad959e21f4a3a7a

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

3e76909a2ea734614f2d94616ad959e21f4a3a7a