Merge branch 'MDL-50921-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 06:26:57 +0000 (14:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 06:26:57 +0000 (14:26 +0800)
1  2 
lib/moodlelib.php

Simple merge