]> git.ipfire.org Git - people/jschlag/network.git/commitdiff
projects / people / jschlag / network.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d6dab2 54fbafe)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/network
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 Oct 2015 15:39:26 +0000 (17:39 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 Oct 2015 15:39:26 +0000 (17:39 +0200)

Trivial merge
Jonatan's tree of the IPFire 3 network stuff