Merge branch 'MDL-41100-master' of git://github.com/FMCorz/moodle

Conflicts:
	version.php

diff --cc lib/classes/component.php
Simple merge

diff --cc lib/moodlelib.php
Simple merge

diff --cc lib/upgrade.txt
Simple merge

diff --cc version.php
index 431f5ab,6ebbc15..98f6754
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2013081200.00;              // YYYYMMDD      = weekly release date of this DEV branch
 -$version  = 2013080900.00;              // YYYYMMDD      = weekly release date of this DEV branch
++$version  = 2013081300.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                          //         RR    = release increments - 00 in DEV branches
                                          //           .XX = incremental changes