From: Matthias Fischer <fischerm@ipfire.org>
Date: Sat, 4 Apr 2015 21:49:48 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=895e1da27917960895514bdb97c3355a6bc7ae5b;p=people%2Fmlorenz%2Fipfire-2.x.git

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

895e1da27917960895514bdb97c3355a6bc7ae5b