From: Michael Tremer Date: Tue, 11 Feb 2014 11:00:40 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-beta2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64feb1fcc848d0dd8bd7a52dd61b9ec96e95b0b7;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- 64feb1fcc848d0dd8bd7a52dd61b9ec96e95b0b7