]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53d528c dff83f4)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into naoki
authorBenjamin Schweikert <trikolon@ipfire.org>
Wed, 17 Feb 2010 19:28:24 +0000 (20:28 +0100)
committerBenjamin Schweikert <trikolon@ipfire.org>
Wed, 17 Feb 2010 19:28:24 +0000 (20:28 +0100)

Trivial merge
Michael's tree of IPFire 3.x.