From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Nov 2013 20:43:02 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-core74~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cb142e76d95f24c396c8b4cd5ac80ea97aee675;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into next
---

8cb142e76d95f24c396c8b4cd5ac80ea97aee675