]> 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: d2acf4f bd21b6d)
Merge commit 'stevee/naoki-fix' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Aug 2010 18:45:17 +0000 (20:45 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Aug 2010 18:45:17 +0000 (20:45 +0200)

Trivial merge
IPFire 3.x development tree