]> 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: ec2285c 8c8383e)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Jul 2015 11:16:45 +0000 (13:16 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 9 Jul 2015 11:16:45 +0000 (13:16 +0200)

Trivial merge
Peter's tree of IPFire 2.x