From: Schantl Stefan <Stevee@ipfire.org>
Date: Sun, 31 Oct 2010 14:37:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into updates
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f19833f473ff4360147e593f07f54cd8da37e27;p=ipfire-3.x.git

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

6f19833f473ff4360147e593f07f54cd8da37e27