]> 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: 5c15e06 7d2ea18)
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Nov 2008 17:44:53 +0000 (18:44 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 29 Nov 2008 17:44:53 +0000 (18:44 +0100)

Trivial merge
IPFire 3.x development tree