From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 13 Feb 2014 14:31:25 +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=da9e4e8ed90aae3fc6100bd21cd49804fca6c9bf

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

da9e4e8ed90aae3fc6100bd21cd49804fca6c9bf