From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 20 Jun 2011 13:57:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/pam_ldap'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22ab87796b5d4cda1eb0c75f3aacde77495376ab;p=ipfire-3.x.git

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

22ab87796b5d4cda1eb0c75f3aacde77495376ab