From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Jun 2009 13:43:09 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=646c71fcc65840b136e85195552ba2c3cff1b94a;p=ipfire.org.git

Merge branch 'master' of /srv/git/ipfire.org
---

646c71fcc65840b136e85195552ba2c3cff1b94a