Merge branch 'MDL-40805-master' of git://github.com/lameze/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 21:06:12 +0000 (09:06 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Jun 2014 21:06:12 +0000 (09:06 +1200)
commita0145560b97881a516b14877fe64399e44793f81
tree38882150d3b2d136ba22d4336983e520faa2f1fe
parent03384ff9fda42990d8548bcad330ad5e2b999693
parentf9f9d187f85636edf0060fc94592b433ede688b1
Merge branch 'MDL-40805-master' of git://github.com/lameze/moodle
lib/moodlelib.php