]> 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: d04f1a3 9d4b355)
Merge commit 'ms/naoki' into naoki
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Nov 2009 15:24:51 +0000 (16:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Nov 2009 15:24:51 +0000 (16:24 +0100)

Trivial merge
IPFire 3.x development tree