From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 9 May 2008 13:39:47 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Tag: v3.0-alpha1~1025
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ac96a75435fcf054d5dd2f72053cc93bd2bae64;p=people%2Fms%2Fipfire-3.x.git

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

1ac96a75435fcf054d5dd2f72053cc93bd2bae64