From: Arne Fitzenreiter Date: Fri, 4 Oct 2013 14:55:20 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/next' into fifteen X-Git-Tag: v2.15-beta1~210 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b0d7d6bc3e5870a8f0ada33e2ab3170f942db9e;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'origin/next' into fifteen --- 6b0d7d6bc3e5870a8f0ada33e2ab3170f942db9e