From: Arne Fitzenreiter Date: Wed, 21 Oct 2015 19:02:19 +0000 (+0200) Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core95~40 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=4c5c4f3afcfe65c3bfc2d278304a35fd69965eae Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next --- 4c5c4f3afcfe65c3bfc2d278304a35fd69965eae