Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Nov 2018 15:16:22 +0000 (15:16 +0000)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 2 Nov 2018 15:16:22 +0000 (15:16 +0000)
commit1e2e78e6ff3e98b9de4edefcd520cda3b4e5cea3
tree65ba3bdc1c6d546009003286d85db2cb376ec83f
parent5edc6b10e0d754dcb94604831bbbc7dcfddd464a
parent898b355abd27b86193dd6496a43e49e5bdf672a6
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next