From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 17 Mar 2015 19:42:17 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.17-core91~154^2~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f49ea2ea269b1ef456f7594f67296fd86776dc5;p=ipfire-2.x.git

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

6f49ea2ea269b1ef456f7594f67296fd86776dc5