From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 17 Jan 2016 18:49:03 +0000 (+0000)
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=64285d23eb9003efd7a2273d61814d4cd144431d;p=people%2Fms%2Fipfire-2.x.git

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

64285d23eb9003efd7a2273d61814d4cd144431d