From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Mar 2013 21:19:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/openldap'
X-Git-Tag: pango~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76325a2122d8afd3432f5cb14c99b2430d8dd787;p=people%2Fstevee%2Fipfire-3.x.git

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

76325a2122d8afd3432f5cb14c99b2430d8dd787