From: Jan Paul Tuecking <earl@ipfire.org>
Date: Wed, 23 Jun 2010 15:47:55 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~195
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=fa3844657695ee2891ef1b483981deb66124f149;hp=-c

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

fa3844657695ee2891ef1b483981deb66124f149