From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 10 Apr 2011 08:44:33 +0000 (+0200)
Subject: Merge branch 'master' into kernel36
X-Git-Tag: v2.9-core53~127^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e865603286978e87a7611cf4471d4844f8ef73e4;p=ipfire-2.x.git

Merge branch 'master' into kernel36

Conflicts:
	config/rootfiles/common/Mail-Tools
---

e865603286978e87a7611cf4471d4844f8ef73e4