Merge branch 'MDL-54778-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
commit6b90efd076e263774b37887ab06a9736cfb084d4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 23:30:01 +0000 (22 01:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 23:30:01 +0000 (22 01:30 +0200)
tree96439f1ccc60d6e9bf9be5f0ae9cc7647649b272
parent041e40cf1b423906a95fab752729bae89b3f1d9f
parent56fb03794cbc646676a2f61e11acb8b867ad9e51
Merge branch 'MDL-54778-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE