From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 10 Apr 2011 08:39:08 +0000 (+0200)
Subject: Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
X-Git-Tag: v2.9-core49~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=603e55bb100e5c46b298d84b702e0d560d97ed03;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/49/filelists/files
---

603e55bb100e5c46b298d84b702e0d560d97ed03