From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Nov 2013 20:43:20 +0000 (+0100)
Subject: Merge branch 'master' into fifteen
X-Git-Tag: v2.15-beta1~139
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0fc392d65d513df573573dec57ccf06af2c29a9f

Merge branch 'master' into fifteen
---

0fc392d65d513df573573dec57ccf06af2c29a9f