Merge branch 'MDL-53647' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 19:59:23 +0000 (21:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Apr 2016 19:59:23 +0000 (21:59 +0200)
commit1183dfa0f73b7efbad0968e170a00c9f4025d4ca
tree4e5b99c22448a9c69b4b15d74fb7f5d002f0d5cb
parentcf0f0fc7f4c52bf2bd0203f867dc72221a805321
parent56df6f1992995ac67ae54ca86577333551705c75
Merge branch 'MDL-53647' of git://github.com/timhunt/moodle