From: Matthias Fischer <fischerm@ipfire.org>
Date: Fri, 26 Jun 2015 16:06:47 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into curl
X-Git-Tag: v2.17-core92~10^2~2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19fa533522078560ef17b0a79e2caeffc371b382;p=ipfire-2.x.git

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

19fa533522078560ef17b0a79e2caeffc371b382