From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 4 May 2015 18:15:24 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.17-core91~73^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f63cb53f4aa6b049e01aad78a724c9b5dca1a42a;p=ipfire-2.x.git

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

f63cb53f4aa6b049e01aad78a724c9b5dca1a42a