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

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

cdb4dc96305083c0d16977fb6e1db1d665bb6196