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 6ed3b8b942f5a5e7d42f1f558158e4c5edc00064,f30cdf6a5346c93c52fbf0ec9ea5f1403cd82d44..48c224a3034b27c4ec84c23d64df495850a8b2f5
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -75,7 -77,7 +77,7 @@@ class OC_Util 
        public static function getVersion() {
                // hint: We only can count up. Reset minor/patchlevel when
                // updating major/minor version number.
-               return array(4, 97, 11);
 -              return array(5, 80, 02);
++              return array(5, 80, 03);
        }
  
        /**

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