From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 26 Feb 2011 19:01:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into fixes4pakfire
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=157ce3f4f4e0ecbe8b84bc38ef1169f3ed6e4b66;p=ipfire-3.x.git

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

157ce3f4f4e0ecbe8b84bc38ef1169f3ed6e4b66