From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Sun, 2 May 2010 20:19:18 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~337
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=bc3e1b292534d100ed2ee3fc29b6c56d556ba3d5

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

bc3e1b292534d100ed2ee3fc29b6c56d556ba3d5