debug output removed
moved iframe height and width fix from js to css
Change strucutre of cloud/capabilities response
Remove accidental inclusion of apps repo.
don't add a extra 'Trash' breadcrumb since we have the home-symbol now
remove code properly
initialize breadcrumbs array
Add capabilities exposure to the versioning app
Merge branch 'ocs_capabilities' into ocs_multiple_methods
Merge pull request #1565 from owncloud/fix_replacing

remove code properly to make @DeepDiver1975 happy ;)
Use OC_User::isAdminUser() in lib/api.php
Merge in master
Merge pull request #1512 from owncloud/mapped-filename-storage

initial version of a local storage implementation which will use unique ...
Fix api result merging.
know your libraries ;-)

strrpos fails in cases the file in the path has no dot but the parent folder
Another attempt on the filelist heading.
Merge branch 'master' of https://github.com/owncloud/core

Conflicts:
	apps/files_external/appinfo/app.php
Deleted phpseclib/tests
Modified to new class structure
Merge pull request #1481 from owncloud/fixing-1354-master

basic WebDAV test in place now