merging

conf/dokuwiki.php

inc/httputils.php

inc/lang/sv/lang.php

inc/parserutils.php

inc/template.php

lib/exe/css.php

lib/exe/js.php

lib/plugins/acl/lang/sv/lang.php

lib/plugins/config/lang/en/lang.php

lib/plugins/config/lang/sv/lang.php

lib/plugins/config/settings/config.metadata.php

lib/plugins/plugin/lang/sv/lang.php

lib/plugins/popularity/lang/sv/lang.php

lib/plugins/revert/lang/sv/lang.php

lib/plugins/usermanager/lang/sv/lang.php

lib/scripts/behaviour.js

lib/scripts/compatibility.js

lib/scripts/drag.js

lib/scripts/editor.js

lib/scripts/events.js