From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 22:42:57 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
X-Git-Tag: v2.15-core82~24^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5240f73d9c73c30ea92fab982d31ca986fb86e2e;p=ipfire-2.x.git

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

5240f73d9c73c30ea92fab982d31ca986fb86e2e