Merge branch 'MDL-53547_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
commit28e787764595a8e3749446a9db74c1ef3ff51599
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Mar 2016 21:58:41 +0000 (22 22:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Mar 2016 21:58:41 +0000 (22 22:58 +0100)
tree2c429f7279518bfc5062f9184f00abf41dff52ee
parent800d62c56d15b44f113852a64d888afc7e389240
parent01bacdae557fd4f4fb4ed15628beb4e5d26bb3aa
Merge branch 'MDL-53547_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE