]> 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: 6ced627 7ac136f)
Merge remote branch 'stevee/updates' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Dec 2010 13:18:52 +0000 (14:18 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Dec 2010 13:18:52 +0000 (14:18 +0100)

Trivial merge
IPFire 3.x development tree