From: Michael Tremer Date: Thu, 9 Jul 2015 11:10:06 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.17-core93~35 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=ec2285c8113461f7fedb3fde549d76b3f5e40800 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- ec2285c8113461f7fedb3fde549d76b3f5e40800