]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commitdiff
projects / people / pmueller / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab1d916 48e44b0)
Merge remote-tracking branch 'stevee/openldap'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 Mar 2012 09:13:50 +0000 (10:13 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 Mar 2012 09:13:50 +0000 (10:13 +0100)

Trivial merge
Peter's tree of IPFire 3.x