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