]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
Merge remote-tracking branch 'stevee/openldap-improvements'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 13 Jan 2013 19:36:27 +0000 (20:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 13 Jan 2013 19:36:27 +0000 (20:36 +0100)

Trivial merge