Merge remote-tracking branch 'origin/master' into loggedin-class

.htaccess.dist

_test/core/TestRequest.php

_test/core/TestResponse.php

_test/tests/inc/PassHash.test.php

_test/tests/inc/common_ml.test.php

_test/tests/inc/httpclient_http.test.php

_test/tests/inc/tar.test.php

_test/tests/inc/tar/block.txt

_test/tests/inc/tar/zero.txt

_test/tests/lib/exe/fetch_imagetoken.test.php

_test/tests/test/basic.test.php

conf/.htaccess

conf/interwiki.conf

conf/mysql.conf.php.example

data/.htaccess

data/deleted.files

data/pages/wiki/dokuwiki.txt

doku.php

feed.php

inc/.htaccess