From: Arne Fitzenreiter Date: Thu, 16 Jul 2015 10:25:43 +0000 (+0200) Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core93~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66289de753c1ca1c2196b1246fcab46ec7735ba4;p=ipfire-2.x.git Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next --- 66289de753c1ca1c2196b1246fcab46ec7735ba4