From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 5 Aug 2012 12:14:20 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.11-core62^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=466a93593959397ed860711a00119041c5ffb038;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into next
---

466a93593959397ed860711a00119041c5ffb038