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

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

3e0cef2a2673b6c434e10bc656b99a5feb550ff4