Merge branch 'master' of git://github.com/splitbrain/dokuwiki

_test/cases/inc/safefn.test.php

conf/wordblock.conf

data/deleted.files

doku.php

inc/SafeFN.class.php

inc/Sitemapper.php

inc/actions.php

inc/common.php

inc/fulltext.php

inc/html.php

inc/init.php

inc/lang/de-informal/draft.txt

inc/lang/de/draft.txt

inc/lang/eu/adminplugins.txt

inc/lang/eu/lang.php

inc/lang/eu/subscr_digest.txt

inc/lang/eu/subscr_form.txt

inc/lang/eu/subscr_list.txt

inc/lang/eu/subscr_single.txt

inc/lang/zh/lang.php