From: Daniel Glanzmann <dg@ipfire.org>
Date: Wed, 1 Oct 2008 22:34:29 +0000 (+0200)
Subject: Merge branch 'work'
X-Git-Tag: v2.3-beta4~12^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cc86a2a13de91f23397702750e479ec58679bcf;p=ipfire-2.x.git

Merge branch 'work'
---

2cc86a2a13de91f23397702750e479ec58679bcf