From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Oct 2014 20:55:54 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.15-core85^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dadfa436c9fbe800b1060e673bc17d96ef827874;p=ipfire-2.x.git

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

dadfa436c9fbe800b1060e673bc17d96ef827874