From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Feb 2014 12:50:01 +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=36d44213e93fadcd3fac982f14bacc61f4ce977d

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

36d44213e93fadcd3fac982f14bacc61f4ce977d