Merge branch 'MDL-54983-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jun 2016 19:56:32 +0000 (12:56 -0700)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jun 2016 19:56:32 +0000 (12:56 -0700)
1  2 
lib/moodlelib.php

Simple merge