]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5bbd27 a97fad0)
Merge remote-tracking branch 'ms/glibc-update2' into glibc-update2
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Aug 2012 10:13:53 +0000 (12:13 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Aug 2012 10:13:53 +0000 (12:13 +0200)

Trivial merge
Peter's tree of IPFire 2.x