From: Michael Tremer Date: Sat, 15 Feb 2014 17:42:37 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-beta2~3 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e39096cf66b2e16880400f70d3792f25399fff13 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- e39096cf66b2e16880400f70d3792f25399fff13