From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 7 Mar 2014 15:33:42 +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=59124eeb2aacdee2229b68e128cfa8c738ee1a68

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

59124eeb2aacdee2229b68e128cfa8c738ee1a68