From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 3 May 2015 11:03:25 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.17-core91~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c97e773002a5d63c2bfda7cc904082a06652c28;p=ipfire-2.x.git

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
---

2c97e773002a5d63c2bfda7cc904082a06652c28