merge master into filecache_mtime

diff --cc db_structure.xml
Simple merge

diff --cc lib/files/cache/cache.php
Simple merge

diff --cc lib/files/cache/scanner.php
Simple merge

diff --cc lib/files/view.php
Simple merge

diff --cc lib/util.php
index 7950586b5804aa1981be1064a4fe52af83c6dde4,b2a4fce65a2ac7ecb35339680ce62f6cf54b7b53..e739f76034c371798253f6f62b8db31e5577caac
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -73,8 -73,9 +73,9 @@@ class OC_Util 
         * @return array
         */
        public static function getVersion() {
-               // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.90.0. This is not visible to the user
-               return array(4, 91, 10);
+               // hint: We only can count up. So the internal version number
+               // of ownCloud 4.5 will be 4.90.0. This is not visible to the user
 -              return array(4, 92, 10);
++              return array(4, 92, 11);
        }
  
        /**

diff --cc tests/lib/files/cache/watcher.php
Simple merge