Merge branch 'master' into python

config/rootfiles/packages/ipfireseeder

@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.9.i586-full-core47.iso.torrent
+var/ipfire/seeder/ipfire-2.9.i586-full-core48.iso.torrent
 #var/log/seeder
 var/log/seeder/info

config/rootfiles/packages/mc

@@ -1,25 +1,20 @@
 usr/bin/mc
 usr/bin/mcdiff
 usr/bin/mcedit
-usr/bin/mcmfmt
 usr/bin/mcview
 usr/etc
 usr/etc/mc
-usr/etc/mc/Syntax
 usr/etc/mc/cedit.menu
 usr/etc/mc/edit.indent.rc
 usr/etc/mc/edit.spell.rc
 usr/etc/mc/filehighlight.ini
-usr/etc/mc/mc.charsets
 usr/etc/mc/mc.ext
 usr/etc/mc/mc.keymap
 usr/etc/mc/mc.keymap.default
 usr/etc/mc/mc.keymap.emacs
-usr/etc/mc/mc.lib
 usr/etc/mc/mc.menu
 usr/etc/mc/mc.menu.sr
 usr/etc/mc/sfs.ini
-#usr/libexec
 #usr/libexec/mc
 usr/libexec/mc/cons.saver
 #usr/libexec/mc/extfs.d
@@ -79,27 +74,24 @@ usr/libexec/mc/mc.sh
 #usr/share/man/man1/mcedit.1
 #usr/share/man/man1/mcview.1
 #usr/share/mc
-usr/share/mc/mc.hint
-#usr/share/mc/mc.hint.cs
-#usr/share/mc/mc.hint.es
-#usr/share/mc/mc.hint.hu
-#usr/share/mc/mc.hint.it
-#usr/share/mc/mc.hint.nl
-#usr/share/mc/mc.hint.pl
-#usr/share/mc/mc.hint.ru
-#usr/share/mc/mc.hint.sr
-#usr/share/mc/mc.hint.uk
-#usr/share/mc/mc.hint.zh
-usr/share/mc/mc.hlp
-usr/share/mc/skins
+#usr/share/mc/help
+usr/share/mc/help/mc.hlp
+#usr/share/mc/hints
+usr/share/mc/hints/mc.hint
+usr/share/mc/mc.charsets
+usr/share/mc/mc.lib
+#usr/share/mc/skins
+usr/share/mc/skins/dark.ini
 usr/share/mc/skins/darkfar.ini
 usr/share/mc/skins/default.ini
 usr/share/mc/skins/double-lines.ini
 usr/share/mc/skins/featured.ini
 usr/share/mc/skins/gotar.ini
+usr/share/mc/skins/mc46.ini
 usr/share/mc/skins/nicedark.ini
 #usr/share/mc/syntax
 usr/share/mc/syntax/PKGBUILD.syntax
+usr/share/mc/syntax/Syntax
 usr/share/mc/syntax/ada95.syntax
 usr/share/mc/syntax/aspx.syntax
 usr/share/mc/syntax/assembler.syntax
@@ -110,6 +102,7 @@ usr/share/mc/syntax/changelog.syntax
 usr/share/mc/syntax/cs.syntax
 usr/share/mc/syntax/css.syntax
 usr/share/mc/syntax/cxx.syntax
+usr/share/mc/syntax/cython.syntax
 usr/share/mc/syntax/d.syntax
 usr/share/mc/syntax/debian-changelog.syntax
 usr/share/mc/syntax/debian-control.syntax

config/rootfiles/packages/mdadm

@@ -1,4 +1,6 @@
-lib/udev/rules.d
+etc/rc.d/rc0.d/S85mdadm
+etc/rc.d/rc6.d/S75mdadm
+etc/rc.d/rcsysinit.d/S11mdadm
 lib/udev/rules.d/64-md-raid.rules
 sbin/mdadm
 sbin/mdmon
@@ -7,3 +9,4 @@ sbin/mdmon
 #usr/share/man/man8/mdadm.8
 #usr/share/man/man8/mdmon.8
 etc/rc.d/init.d/mdadm
+srv/web/ipfire/cgi-bin/mdstat.cgi

config/rootfiles/packages/nano

@@ -9,17 +9,34 @@ usr/bin/rnano
 #usr/share/man/man5/nanorc.5
 #usr/share/nano
 usr/share/nano/asm.nanorc
+usr/share/nano/awk.nanorc
 usr/share/nano/c.nanorc
+usr/share/nano/cmake.nanorc
+usr/share/nano/css.nanorc
+usr/share/nano/debian.nanorc
+usr/share/nano/fortran.nanorc
+usr/share/nano/gentoo.nanorc
 usr/share/nano/groff.nanorc
 usr/share/nano/html.nanorc
 usr/share/nano/java.nanorc
+usr/share/nano/makefile.nanorc
+#usr/share/nano/man-html
+#usr/share/nano/man-html/nano.1.html
+#usr/share/nano/man-html/nanorc.5.html
+#usr/share/nano/man-html/rnano.1.html
 usr/share/nano/man.nanorc
+usr/share/nano/mgp.nanorc
 usr/share/nano/mutt.nanorc
 usr/share/nano/nanorc.nanorc
+usr/share/nano/objc.nanorc
+usr/share/nano/ocaml.nanorc
 usr/share/nano/patch.nanorc
 usr/share/nano/perl.nanorc
+usr/share/nano/php.nanorc
 usr/share/nano/pov.nanorc
 usr/share/nano/python.nanorc
 usr/share/nano/ruby.nanorc
 usr/share/nano/sh.nanorc
+usr/share/nano/tcl.nanorc
 usr/share/nano/tex.nanorc
+usr/share/nano/xml.nanorc

config/rootfiles/packages/vdradmin

@@ -180,5 +180,6 @@ etc/rc.d/rc6.d/K01vdradmin
 etc/rc.d/rc3.d/S99vdradmin
 #usr/share/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo
 #usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo
+var/cache/vdradmin
 var/log/vdradmin
 var/run/vdradmin