]> 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: 9659f59 6f0fd5e)
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Nov 2013 10:41:18 +0000 (11:41 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Nov 2013 10:41:18 +0000 (11:41 +0100)

Trivial merge
Peter's tree of IPFire 2.x