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

Merge branch 'master' into next
---

34daf4dbf8e4e5e4fb901f8dcece703480a1ac1f