]> 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: 628ad2c f7b9315)
Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Aug 2012 14:41:18 +0000 (16:41 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Aug 2012 14:41:18 +0000 (16:41 +0200)

Trivial merge
Peter's tree of IPFire 2.x