From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 9 Apr 2012 10:15:59 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.11-core61^2~56
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=6560ecaa51f5493aa5674825d1d1b7bc9e464184

Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/58/filelists/files
	make.sh
---

6560ecaa51f5493aa5674825d1d1b7bc9e464184
diff --cc config/rootfiles/core/58/filelists/files
index 047127e7e5,afb3d99699..19d98e57cf
--- a/config/rootfiles/core/58/filelists/files
+++ b/config/rootfiles/core/58/filelists/files
@@@ -1,7 -1,3 +1,10 @@@
  etc/system-release
  etc/issue
  etc/vimrc
++<<<<<<< HEAD
 +srv/web/ipfire/cgi-bin/index.cgi
 +srv/web/ipfire/cgi-bin/ovpnmain.cgi
 +var/ipfire/general-functions.pl
 +var/ipfire/langs
++=======
++>>>>>>> master