From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 8 Apr 2010 12:21:50 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00fd1cf386eda3d1e5573f5f3451912c59d9bde8;p=ipfire-3.x.git

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

00fd1cf386eda3d1e5573f5f3451912c59d9bde8