From: Alexander Marx Date: Thu, 9 Jan 2014 15:23:39 +0000 (+0100) Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout X-Git-Tag: v2.15-beta1~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3932f02ba33e0f0b7686db4bd6f4609ae7e3d370;p=people%2Fms%2Fipfire-2.x.git Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen-layout --- 3932f02ba33e0f0b7686db4bd6f4609ae7e3d370