From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 Feb 2013 14:36:11 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.13-core67~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd88f2ee298f63440e81b37680ca2c0a48790ce2;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into next
---

fd88f2ee298f63440e81b37680ca2c0a48790ce2