]> 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: dda8657 9830764)
Merge branches 'master' and 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms...
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 May 2010 20:35:19 +0000 (22:35 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 May 2010 20:35:19 +0000 (22:35 +0200)

Trivial merge
IPFire 3.x development tree