Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css

Fixed Dropbox/Google storage async save call

copy files to owners trash recursively

Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder

call getFileInfo to enforce a file cache entry for the new version

Indicate password strength

keep response message

 * uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29

Use storage_mtime when determining if we can reuse cached data while scanning

LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page

Fix calculated folder size to use unencrypted size

Fixed timezone issue with SMB storage

it is not an urgent error... a DEBUG message is enough at this point

no warnings within unlinkDir() within the TestCleanupListener

remove ru_RU - it has bee removed from transifex

* owncloud/remove-ru_RU-master:
  remove ru_RU - it has bee removed from transifex

Now forcing smbclient to also run on UTC

Fixing Issue #6301 on master branch

fixing typo in redirection query string

fix email template l10n, emphasize filename