From: Matthias Fischer <fischerm@ipfire.org>
Date: Tue, 16 Jun 2015 10:02:42 +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~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd13db416633e3fb4242c7ff39d235799cd28910;p=people%2Fstevee%2Fipfire-2.x.git

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

dd13db416633e3fb4242c7ff39d235799cd28910