Cache: better rename hook for cache updater
Correct emails when folders are shared.

itemType is never "dir"; it's either "file" or "folder".
create new version if the same file is uploaded again over the web interface
fix var name
fix var name
Added 3rdparty folder as a git submodule
Add backtick for trash app to prevent pg errors
Merge pull request #2317 from owncloud/create_version_on_upload

create new version if the same file is uploaded again over the web interface
Merge pull request #2336 from eMerzh/fix_trashpg

Add backtick for trash app to prevent pg errors
add backtick for db queries to prevent postgresql errors
remove backticks around table names
Filter display of blacklisted files

Blacklisted files like ".htaccess" and ".git" should not only be
blacklisted for upload and rename, but they should also not be displayed
in the directory listings.

I needed this personally to hide ".git" folders in shared folders. Its
also a simple implementation of feature requests like
http://forum.owncloud.org/viewtopic.php?f=4&t=3279 and
http://forum.owncloud.org/viewtopic.php?f=3&t=5708
Merge pull request #2320 from ceri/master

Fix erroneous email when folders are shared
Update settings.php

fixed overlap of input controls (root cert import)
see issue: https://github.com/owncloud/apps/issues/767
Merge pull request #2350 from aschoenebeck/ignore_blacklisted_files

Filter display of blacklisted files
Merge remote-tracking branch 'upstream/master'

Conflicts:
	apps/files_external/templates/settings.php
Merge pull request #2360 from sherbrecher/master

files_external: fix for overlap if input controls
Merge pull request #2322 from PHLAK/master

Added 3rdparty folder as a git submodule
Restores keyboard accessibility for expandable settings area.

Tabindex="0" makes the element focussable with the keyboard and
role="link" tells assistive technologies that this clickable span
element is supposed to be presented as a hyperlink.
Add error handling to the file cache upgrade