merge master into backgroundjob

diff --cc apps/user_ldap/appinfo/app.php
Simple merge

diff --cc cron.php
Simple merge

diff --cc db_structure.xml
Simple merge

diff --cc lib/base.php
Simple merge

diff --cc lib/util.php
index b3fab5041f2263f5d2954501b3a7d539316dac55,035815c057f61cf5df4ecbd7f366ac0e03a03aa9..95af22ed0eedfa9481ae2f63b7caa997ba32a307
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -75,7 -80,7 +80,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(5, 80, 03);
 -              return array(5, 80, 04);
++              return array(5, 80, 05);
        }
  
        /**