From: Arne Fitzenreiter Date: Mon, 30 Dec 2013 12:45:10 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/next' into fifteen X-Git-Tag: v2.15-beta1~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba263fbbb9d10ceab94ffe6640e164e7c9423e51;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'origin/next' into fifteen --- ba263fbbb9d10ceab94ffe6640e164e7c9423e51