]> git.ipfire.org Git - ipfire.org.git/commitdiff
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire.org
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 Nov 2018 23:21:50 +0000 (23:21 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 Nov 2018 23:21:50 +0000 (23:21 +0000)

Trivial merge