Conflicts:
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/tests/api.php
	lib/private/share/share.php

typo fix, by translators on transifex

* owncloud/l10n-expire:
  typo fix, by translators on transifex

fix layout of external storage config table

fix search by mime for shared single files

Proper injection of filesystem view into the webdav connector

fix paths of searchByMime results on substorages

Icon improvements

Make PHPUnit_Framework_TestListener implementations compatible to 4.0.

* owncloud/phpunit-4.0-compat:
  Normalise testcleanuplistener.php indentation and end of file.
  Make PHPUnit_Framework_TestListener implementations compatible to 4.0.

Add flv to known mimetypes

remove the "Shared" folder

fixing unit tests

Add unit tests for arrays and quotationmark

* owncloud/add-xss-tests:
  Remove uneeded newline
  Fix indentation
  Add unit tests for arrays and "

[sharing] allow admin to set default expire date

* owncloud/sharing_set_default_expire_date:
  add setting to set default expire date

This adds one more missing untranslated text from lib/share

Preventing access to the config folder

It isn't uncommon that admins create a backup file of the config (i.e. `config.php.bak`) before performing any changes. This would allow everybody to read the backup of the configuration file which contain several secret and critical values.

I don't believe this is worth a backport or getting added to the installer. It's just a nice to have. People that create public readable backups of their configuration are the one to blame, not us :-)