From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 15 Oct 2015 10:59:44 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a18b5b4f4d383aaf132ff9e10fd3c9345d74d933;p=people%2Fms%2Fipfire-2.x.git

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

a18b5b4f4d383aaf132ff9e10fd3c9345d74d933