projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e011c2 7c8031e)
Merge branch 'glibc-update' into thirteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Jun 2012 21:31:17 +0000 (23:31 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Jun 2012 21:31:17 +0000 (23:31 +0200)

Trivial merge
Timo's tree of IPFire 2.x