]> git.ipfire.org Git - people/stevee/ipfire-3.x.git/commitdiff
projects / people / stevee / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8985a69 b6efa3c)
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 3 Feb 2009 15:51:31 +0000 (16:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 3 Feb 2009 15:51:31 +0000 (16:51 +0100)

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