Merge remote-tracking branch 'origin/master' into authpluginconfig

.htaccess.dist

_test/tests/inc/httpclient_http.test.php

_test/tests/inc/media_get_from_url.test.php

data/_dummy

data/attic/_dummy

data/cache/_dummy

data/index/_dummy

data/locks/_dummy

data/media_attic/_dummy

data/media_meta/_dummy

data/meta/_dummy

data/tmp/_dummy

inc/HTTPClient.php

inc/Mailer.class.php

inc/actions.php

inc/auth.php

inc/html.php

inc/httputils.php

inc/io.php

inc/lang/af/lang.php