From: Christian Schmidt <christian.schmidt@ipfire.org>
Date: Tue, 13 Jul 2010 09:36:35 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~168^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=30736cd3fc24cae4487a0cdb39f2763538900ae9

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

30736cd3fc24cae4487a0cdb39f2763538900ae9