From: Stefan Schantl Date: Tue, 21 Apr 2015 17:20:26 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core91~116 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a54ec49e18e2a77ab0003fbae92ae31068f8d9fc;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- a54ec49e18e2a77ab0003fbae92ae31068f8d9fc