Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 23:55:02 +0000 (11:55 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 13 Jul 2014 23:55:02 +0000 (11:55 +1200)
commiteb5942ea9d2199bd921c832174147716e4bcba28
treec95a5fafd4f1faf849924916d7a33c41d58f2e12
parent72c9c5fa13f01298fb2b055bd85167e2bf8d03fc
parent65d7932ca3f268445f2f0c6eab457189d3af4478
Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle
lib/moodlelib.php