From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 22 Apr 2015 11:07:30 +0000 (+0200)
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=334620ee2bf24a4d80303b766f91bc64178c4042;p=people%2Fms%2Fipfire-2.x.git

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

334620ee2bf24a4d80303b766f91bc64178c4042