Merge branch 'MDL-52263-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Apr 2016 15:50:29 +0000 (16:50 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Apr 2016 15:50:29 +0000 (16:50 +0100)
commitd350414813ea5ae9f0c4ad0faa74290fb358df8f
tree474a2d6677e3254271d311d2af916268f909e372
parent61a0465ce76154dbe223649c58c66313e9b510ae
parentb1a9804a9b52c236fe1edac9a37c973507725239
Merge branch 'MDL-52263-master' of git://github.com/crazyserver/moodle