From: Michael Tremer Date: Tue, 25 Feb 2014 11:23:33 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-rc1~98 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52ecb188bcc2fd922fca816f80b6db609d89002a;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 52ecb188bcc2fd922fca816f80b6db609d89002a