]> 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: c3cb5d3 1ed9553)
Merge remote branch 'ms/master'
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Feb 2010 17:17:47 +0000 (18:17 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 5 Feb 2010 17:17:47 +0000 (18:17 +0100)

Trivial merge
IPFire 3.x development tree