]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a134f9c 20bc728)
Merge branch 'kernel-config'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 9 Nov 2011 22:45:26 +0000 (23:45 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 9 Nov 2011 22:45:26 +0000 (23:45 +0100)

Trivial merge
Michael's tree of IPFire 3.x.