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

.gitignore

_test/cases/inc/search/data/ns1/ns3/page3.txt

_test/cases/inc/search/data/ns1/page1.txt

_test/cases/inc/search/data/ns1/page2.txt

_test/cases/inc/search/data/ns2/nopage.ext

_test/cases/inc/search/data/ns2/page1.txt

_test/cases/inc/search/search.test.php

conf/dokuwiki.php

conf/mediameta.php

conf/plugins.protected.php

data/media_attic/_dummy

data/media_meta/_dummy

feed.php

inc/actions.php

inc/changelog.php

inc/common.php

inc/config_cascade.php

inc/html.php

inc/infoutils.php

inc/init.php