From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 Feb 2014 10:56:52 +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/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=582fa1555574ac0b6abc0a4daee906d1a9a091ef

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

582fa1555574ac0b6abc0a4daee906d1a9a091ef