]> 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: bd1063a b0a3490)
Merge remote-tracking branch 'stevee/openldap-update'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Sep 2012 18:21:51 +0000 (20:21 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 16 Sep 2012 18:21:51 +0000 (20:21 +0200)

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