Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 15 Jun 2017 16:40:32 +0000 (18:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 15 Jun 2017 16:40:32 +0000 (18:40 +0200)
commit6af04bf600666cf8462df931d2fd6e5f4673ef9b
treeeb6909e1e76d1cc3f0238a384ffc1985792e4653
parent191399a3c0693fd567e1690e9829bb534f64b7e0
parent15a2c03f5d1a71c17ab3befc720843065eb02a14
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next