From: Michael Tremer Date: Tue, 20 May 2014 09:25:48 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Tag: v2.15-core79~52^2^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=763190af8e3272a1edd582e1e1736bfc8c0c1baa;p=ipfire-2.x.git Merge remote-tracking branch 'origin/master' into next --- 763190af8e3272a1edd582e1e1736bfc8c0c1baa