From: Matthias Fischer <fischerm@ipfire.org>
Date: Wed, 8 Apr 2015 22:38:06 +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/?p=people%2Fmfischer%2Fipfire-2.x.git;a=commitdiff_plain;h=4d3dc4bd65d5528a17bc845f169a60df55a42f22

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

4d3dc4bd65d5528a17bc845f169a60df55a42f22