Merge branch 'MDL-53012-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:44:57 +0000 (10:44 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:44:57 +0000 (10:44 +0000)
1  2 
lib/moodlelib.php

Simple merge