Merge branch 'MDL-55113-30' of git://github.com/dpalou/moodle into MOODLE_30_STABLE
commit968a10d3e5693dcf78767e289193f80698b9a737
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 10:22:00 +0000 (5 12:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 10:22:00 +0000 (5 12:22 +0200)
treef648559cd8fa1e12bba8cfe691479e3b63a56a0d
parente2d37a1957920f10ce8d0ad5d1d870604e5b3b30
parent693e18492738920250a6c87032597ce259b93a65
Merge branch 'MDL-55113-30' of git://github.com/dpalou/moodle into MOODLE_30_STABLE