From: Matthias Fischer <fischerm@ipfire.org>
Date: Sat, 20 Jun 2015 21:08:05 +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~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9cc5fe54aeb906a8183baf42aa34a414c73acc76;p=ipfire-2.x.git

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

9cc5fe54aeb906a8183baf42aa34a414c73acc76