From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 22 Oct 2016 08:33:46 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.19-core108~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a2ebd32c0fdbda840271796c8d25a8e36b7c84b;p=ipfire-2.x.git

Merge branch 'master' into next
---

5a2ebd32c0fdbda840271796c8d25a8e36b7c84b