]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/core105' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 23 Sep 2016 16:49:06 +0000 (18:49 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 23 Sep 2016 16:49:06 +0000 (18:49 +0200)

Trivial merge