From: Matthias Fischer <fischerm@ipfire.org>
Date: Thu, 28 May 2015 19:16: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/?a=commitdiff_plain;h=256dcf08cf10f157b038fd41fe7cdb0a5b79a83c;p=people%2Fms%2Fipfire-2.x.git

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

256dcf08cf10f157b038fd41fe7cdb0a5b79a83c