Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 23 Jan 2019 20:18:44 +0000 (21:18 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 23 Jan 2019 20:18:44 +0000 (21:18 +0100)
commit7c26f07dabd486f1723615e2546f52c825f8899b
tree03825ab17630672e2413aecd47cf3432e4b7715b
parentb9d494e7736ab1fa543903542f2b922ac370331f
parent26d07ee5da961c7ac8a062b6e8386800cd5f21f7
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next