]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 261f88e 9e31e76)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Feb 2012 20:54:26 +0000 (21:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 8 Feb 2012 20:54:26 +0000 (21:54 +0100)

Trivial merge
IPFire 2.x development tree