From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 7 Jul 2011 19:57:36 +0000 (+0200)
Subject: Merge branch 'master' into core50
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=cbb914abe8dd48de5c055ba88d4d906e972a3c5a

Merge branch 'master' into core50

Conflicts:
	config/rootfiles/core/50/filelists/icons
---

cbb914abe8dd48de5c055ba88d4d906e972a3c5a