From: Jan Paul Tuecking <earl@ipfire.org>
Date: Sat, 20 Jun 2009 15:22:10 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
X-Git-Tag: v2.5-core29~65
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=731253af525f8cf84ae6f1a9ccfa60532ba5b4d8

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

731253af525f8cf84ae6f1a9ccfa60532ba5b4d8