From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 29 Dec 2011 15:30:21 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.11-core56^2~25^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f530902b81da9c6d275d7ed2d40341371e1a389e;p=ipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

f530902b81da9c6d275d7ed2d40341371e1a389e