From: Matthias Fischer <fischerm@ipfire.org>
Date: Wed, 8 Apr 2015 22:38:06 +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~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d3dc4bd65d5528a17bc845f169a60df55a42f22;p=ipfire-2.x.git

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

4d3dc4bd65d5528a17bc845f169a60df55a42f22