Merge branch 'master' into sharing

admin/js/users.js

admin/templates/users.php

admin/users.php

apps/files_publiclink/lib_public.php

apps/files_publiclink/templates/admin.php

apps/user_ldap/user_ldap.php

apps/user_openid/phpmyid.php

apps/user_openid/user.php

core/css/styles.css

core/templates/login.php

files/ajax/upload.php

files/css/files.css

files/img/loading.gif

files/js/fileactions.js

files/js/filelist.js

files/js/files.js

files/templates/index.php

files/templates/part.list.php

help/templates/index.php

index.php