]> 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: 624615e 9dd1408)
Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Sep 2015 13:05:26 +0000 (14:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 28 Sep 2015 13:05:26 +0000 (14:05 +0100)

Trivial merge
Peter's tree of IPFire 2.x