Merge branch 'master' into trashbin_encryption

diff --cc apps/files_trashbin/index.php
index d575c75f1a3485e7bc07661f727f1d6cc32222c2,d0b3030dbf8364cd36170fdad070d2345ab43d7d..2276fee2f8112e31535c3127ddf46ddde1cc59bd
--- 1/apps/files_trashbin/index.php
--- 2/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@@ -16,8 -16,10 +16,9 @@@ OCP\Util::addScript('files', 'filelist'
  
  $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
  
+ $result = array();
  if ($dir) {
 -      $dirlisting = true;
 -      $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin');\r
 +      $dirlisting = true;\r
        $fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir);
        $dirContent = opendir($fullpath);
        $i = 0;

diff --cc apps/files_trashbin/templates/index.php
Simple merge