]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 218d2d7 764bede)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Jan 2015 09:22:42 +0000 (10:22 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 2 Jan 2015 09:22:42 +0000 (10:22 +0100)

Trivial merge
Peter's tree of IPFire 2.x