]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07ee61b 2e7e95b)
Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Aug 2012 19:25:14 +0000 (15:25 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Aug 2012 19:25:14 +0000 (15:25 -0400)

Trivial merge
Timo's tree of IPFire 2.x