From: Matthias Fischer <fischerm@ipfire.org>
Date: Thu, 12 Feb 2015 18:40:54 +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=9148fbc468aa86504d6e96d5b896b30778d6cad3;p=people%2Ftrikolon%2Fipfire-2.x.git

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

9148fbc468aa86504d6e96d5b896b30778d6cad3