From: Michael Tremer Date: Tue, 2 Jun 2015 19:56:58 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core91~28 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=6c7290acb29d6a9c7d455406a7bf0dafd4897b58 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 6c7290acb29d6a9c7d455406a7bf0dafd4897b58