]> 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: 0ca9f6d 6738176)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Oct 2011 14:39:39 +0000 (16:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Oct 2011 14:39:39 +0000 (16:39 +0200)

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