]> 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: 390daa8 9507da1)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 16 Dec 2011 15:41:09 +0000 (16:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 16 Dec 2011 15:41:09 +0000 (16:41 +0100)

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