From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 17 Aug 2016 17:51:01 +0000 (+0200)
Subject: Merge branch 'core104' into next
X-Git-Tag: v2.19-core105~16
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=d1d60e001a1123e115fe0f262690fcbd79ecdcfd

Merge branch 'core104' into next
---

d1d60e001a1123e115fe0f262690fcbd79ecdcfd