From: Stefan Schantl Date: Wed, 22 Apr 2015 16:25:25 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core91~114 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=851a984121f4a20d646de229c7901258fe5605d2;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 851a984121f4a20d646de229c7901258fe5605d2