From: Matthias Fischer Date: Thu, 28 May 2015 11:23:47 +0000 (+0200) Subject: Merge remote-tracking branch 'origin' into next X-Git-Tag: v2.17-core92~10^2~2^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3194f517b922a98a5cad199d290169e2e0177f2;p=ipfire-2.x.git Merge remote-tracking branch 'origin' into next --- f3194f517b922a98a5cad199d290169e2e0177f2