From: Michael Tremer Date: Fri, 14 Feb 2014 12:50:01 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-beta2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36d44213e93fadcd3fac982f14bacc61f4ce977d;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 36d44213e93fadcd3fac982f14bacc61f4ce977d