]> 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: 4a1f50e 84d71be)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 19 Nov 2012 22:50:33 +0000 (23:50 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 19 Nov 2012 22:50:33 +0000 (23:50 +0100)

Trivial merge
Peter's tree of IPFire 3.x