From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 2 Dec 2010 21:09:35 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
X-Git-Tag: v2.9-beta1~29^2~2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=f37c3a4f65e6a57e2ce23cb21993f0a79d4d4eac

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
---

f37c3a4f65e6a57e2ce23cb21993f0a79d4d4eac