]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bcf692 d236d00)
Merge remote-tracking branch 'stevee/openldap-improvements'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 13 Jan 2013 19:23:27 +0000 (20:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 13 Jan 2013 19:23:27 +0000 (20:23 +0100)

Trivial merge
Michael's tree of IPFire 3.x.