From: Matthias Fischer Date: Fri, 29 May 2015 07:18:34 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core92~10^2~2^2~6 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=84c87c3387606a4c1dc8d3e9259755cce2ccfe06 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 84c87c3387606a4c1dc8d3e9259755cce2ccfe06