]> 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: 11c61e2 10dc4c8)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki
authorSchantl Stefan <Stevee@ipfire.org>
Wed, 17 Feb 2010 20:56:57 +0000 (21:56 +0100)
committerSchantl Stefan <Stevee@ipfire.org>
Wed, 17 Feb 2010 20:56:57 +0000 (21:56 +0100)

Trivial merge
IPFire 3.x development tree