From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Jun 2009 15:05:45 +0000 (+0200)
Subject: Merge branch 'master' of /srv/git/ipfire.org
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=962cfa80833db7a60545f132b89707855ac1c812;p=ipfire.org.git

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

962cfa80833db7a60545f132b89707855ac1c812