From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 10 Jul 2015 16:58:11 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.17-core93~31
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=388f903e9e83a7013824fd858dbda23ba55bb9f8

Merge branch 'master' into next
---

388f903e9e83a7013824fd858dbda23ba55bb9f8