Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Apr 2012 10:15:59 +0000 (12:15 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Apr 2012 10:15:59 +0000 (12:15 +0200)
Conflicts:
config/rootfiles/core/58/filelists/files
make.sh

1  2 
config/rootfiles/core/58/filelists/files
make.sh

@@@ -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
diff --cc make.sh
Simple merge