]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commitdiff
projects / people / pmueller / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a764253 c93f541)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Dec 2011 22:31:33 +0000 (23:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 18 Dec 2011 22:31:33 +0000 (23:31 +0100)

Trivial merge
Peter's tree of IPFire 3.x