From: Jan Paul Tuecking <earl@ipfire.org>
Date: Sun, 18 Apr 2010 20:45:18 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.9-beta1~372
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=7c9de2bed226adf24f6a8313b5cca08e76186d77

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

7c9de2bed226adf24f6a8313b5cca08e76186d77