]> 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: 4c8608f 7c3fec2)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Dec 2011 15:46:46 +0000 (16:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Dec 2011 15:46:46 +0000 (16:46 +0100)

Trivial merge
IPFire 2.x development tree