]> 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: 5d5679b 0b1b2cc)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki
authorSchantl Stefan <Stevee@ipfire.org>
Fri, 12 Mar 2010 13:53:45 +0000 (14:53 +0100)
committerSchantl Stefan <Stevee@ipfire.org>
Fri, 12 Mar 2010 13:53:45 +0000 (14:53 +0100)

Trivial merge
IPFire 3.x development tree