projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5296871 f824c93)
Merge branch 'master' into dracut
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Jul 2010 10:09:12 +0000 (12:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Jul 2010 10:09:12 +0000 (12:09 +0200)

Trivial merge
IPFire 2.x development tree