Merge branch 'MDL-54027-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 10:05:06 +0000 (11:05 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 10:05:06 +0000 (11:05 +0100)
commit53b540c82a4cf888a475e9543d614759a9b8e471
treec31ec31a3b505f7abb5e0e72978938c44e3de522
parent07eb3a0db781aaca54356db852892a13ffc03492
parent2140cca1db79338f79309b30d46f54f058468008
Merge branch 'MDL-54027-master' of git://github.com/FMCorz/moodle