Merge branch 'MDL-48756-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Jun 2016 10:49:39 +0000 (11:49 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Jun 2016 10:49:39 +0000 (11:49 +0100)
commit7bcab9d1fd162a11ab08c02d2abd8b02a68b26d0
tree704ba7c546f024b90729f86b9929cef3293ca84f
parent654e77e74d8130b0b78e0a65f179ca843620640f
parent240a9de4ab653febec77fc9226dafc29e73b80b7
Merge branch 'MDL-48756-master' of git://github.com/FMCorz/moodle