From: Matthias Fischer <fischerm@ipfire.org>
Date: Sat, 2 May 2015 20:19:21 +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~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07c09125e1edee75dff5f33fcb07f6feb075111f;p=ipfire-2.x.git

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

07c09125e1edee75dff5f33fcb07f6feb075111f