From: Matthias Fischer <fischerm@ipfire.org>
Date: Wed, 27 May 2015 20:23:51 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.17-core92~10^2~2^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6709c69368acc8a240ef5bbc0f7cbf62fc321422;p=ipfire-2.x.git

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

6709c69368acc8a240ef5bbc0f7cbf62fc321422