From: Matthias Fischer Date: Tue, 16 Jun 2015 19:28:39 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core92~10^2~2^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25ed6b82c7d6e2ee799a4b69da046e4185333b35;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 25ed6b82c7d6e2ee799a4b69da046e4185333b35