]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'next' core117 v2.19-core117
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Dec 2017 20:36:55 +0000 (21:36 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Dec 2017 20:36:55 +0000 (21:36 +0100)

Trivial merge