]> 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: 844e542 2a77d2a)
Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 May 2017 10:24:41 +0000 (11:24 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 May 2017 10:24:41 +0000 (11:24 +0100)

Trivial merge
Peter's tree of IPFire 2.x