Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 08:03:46 +0000 (16:03 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 8 Oct 2013 08:03:46 +0000 (16:03 +0800)
commit44585a1ecde51cbb2fd8a45ec9afae9e0e7e5554
treebbe77b54ce49903a2bbcc7980a6acfd6dc78cfe3
parentb56a6981b330a83fa321b6ee1564ea67fbfa3017
parentbcd5c6a9581b0649ee35b637924d6cfc0b66b5da
Merge branch 'MDL-41792_master' of https://github.com/markn86/moodle
lib/moodlelib.php