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)
commit6a6b0085e0051811a6cc5f7ff6e1a0457f34ebb0
tree3db46c6f4241c27a9e543d47d6712b0fdfd1c84f
parente822312af30f1aa5ec7fa11dec9d39cc12133ead
parent0edd7bd7bd9685cabe264b99b42872acf335fa4a
Merge branch 'MDL-54983-master' of git://github.com/damyon/moodle
lib/moodlelib.php