From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Aug 2009 10:14:27 +0000 (+0200)
Subject: Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=118feec7798e1b03a4d8701bd3792ad57309d55a;p=ipfire-3.x.git

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

118feec7798e1b03a4d8701bd3792ad57309d55a