From: Michael Tremer Date: Wed, 17 Jun 2015 18:40:14 +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~42 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c0ba8eb2009100ed731b369de35f04729acac9e1 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- c0ba8eb2009100ed731b369de35f04729acac9e1