Merge branch 'MDL-53924-master' of git://github.com/FMCorz/moodle
commit11ec31188a343ccea1d3b6887dcd0d6820c4c0e1
authorDan Poltawski <dan@moodle.com>
Tue, 26 Apr 2016 09:28:37 +0000 (26 10:28 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 26 Apr 2016 09:28:37 +0000 (26 10:28 +0100)
treeb452f7991c38b4fcabef612c9e076baa69f508e7
parent4648ae9e14c334d04814409205e145f517e3d476
parentf1a9fcd96a2f48a1daa73107a480ca06db6be492
Merge branch 'MDL-53924-master' of git://github.com/FMCorz/moodle