- removed slash-adding for logout-header-redirect
- add slash if webroot is an empty string
- added comment
add support for nested groups
combineFilterWithAnd recently moved to Access
move nested group checkbox to directory settings
Merge remote branch 'upstream/master' into ldap_nested_groups
remove debug output
fix indentation
use identity test where appropriate
use camelcase variable names
_getGroupsByMember is a private function
lib/files.php: make use of === instead of ==
refactored/cleaned up lib/files.php
cleaned up get() logic
fixed get() to only send headers if requested (xsendfile could get in the way)
do no longer readfile() when already using mod_xsendfile or similar
switched zip file creation to ZipStreamer to create zip files directly in memory
fix coding style to blizzz happy.. ;-)
Add option to change email settings in admin section

Fix issue #7166
Remove duplicated definition and move OC.msg to js/js.js

Fix issue #7166
Reuse the folder id in View->getFolderContents
Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer

Conflicts:
	lib/private/files.php
Fix code to search for mount.json in custom data folders
Fix path to the mount file
updating 3rdparty
Merge branch 'master' into McNetic-zipstreamer