From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Nov 2010 12:23:00 +0000 (+0100)
Subject: Merge branch 'master' into upnp
X-Git-Tag: v2.9-beta1~48^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84c36011d10b6949b60a5641d5250f6aa410f0fc;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into upnp
---

84c36011d10b6949b60a5641d5250f6aa410f0fc