]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d4e890 b8b2278)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into grubby
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 9 Nov 2011 22:47:35 +0000 (23:47 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 9 Nov 2011 22:47:35 +0000 (23:47 +0100)

Trivial merge
IPFire 3.x development tree