]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d5a7f2 a24c4d2)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 29 Jan 2012 23:57:59 +0000 (00:57 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 29 Jan 2012 23:57:59 +0000 (00:57 +0100)

Trivial merge
Alex's tree of IPFire 3.x