merge

build/exe/doliwamp/doliwamp.iss

htdocs/admin/mailman.php

htdocs/admin/spip.php

htdocs/core/class/html.form.class.php

htdocs/core/lib/admin.lib.php

htdocs/langs/ar_SA/bookmarks.lang

htdocs/langs/ar_SA/ftp.lang

htdocs/langs/ar_SA/other.lang

htdocs/langs/ar_SA/paypal.lang

htdocs/langs/bg_BG/bookmarks.lang

htdocs/langs/bg_BG/ftp.lang

htdocs/langs/bg_BG/other.lang

htdocs/langs/bg_BG/paypal.lang

htdocs/langs/da_DK/bookmarks.lang

htdocs/langs/da_DK/ftp.lang

htdocs/langs/da_DK/other.lang

htdocs/langs/da_DK/paypal.lang

htdocs/langs/de_DE/bookmarks.lang

htdocs/langs/de_DE/ftp.lang

htdocs/langs/de_DE/other.lang