From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 20 Apr 2015 17:03:52 +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=0c89de671678acb83c46df6600382b076535cd10;p=people%2Fmfischer%2Fipfire-2.x.git

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

0c89de671678acb83c46df6600382b076535cd10