From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Jan 2014 15:45: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/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=8a7976468d6f6a14edeee5edbc54186d307815ec

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

8a7976468d6f6a14edeee5edbc54186d307815ec