From: Daniel Glanzmann <dg@ipfire.org>
Date: Tue, 30 Sep 2008 11:21:18 +0000 (+0200)
Subject: Merge branch 'work'
X-Git-Tag: v2.3-beta4~12^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96d7683ecbf5eee7251bbd1c12354b0728bd86ca;p=ipfire-2.x.git

Merge branch 'work'
---

96d7683ecbf5eee7251bbd1c12354b0728bd86ca