Merge branch 'master' of git://anongit.kde.org/owncloud

apps/media/js/loader.js

apps/media/js/player.js

apps/user_openid/appinfo/app.php

apps/user_openid/phpmyid.php

apps/user_openid/settings.php

apps/user_openid/templates/settings.php

files/css/files.css

files/js/filelist.js

index.php

lib/template.php

settings/ajax/openid.php

settings/index.php

settings/js/main.js

settings/templates/index.php