Merge branch 'MDL-52983' of git://github.com/aolley/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 12:05:30 +0000 (13:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 12:05:30 +0000 (13:05 +0100)
commitba8491ae3f86275ef25c992f2829ea6918bcc4ec
treec27aa63eba464cdb22ffe6477e6db079f813eadd
parent04b3c78da465092cbc7cffe0de5bb2d01b0b40ac
parent15c9a9d726b13fd21d38ca45b2d1d39bff80ff76
Merge branch 'MDL-52983' of git://github.com/aolley/moodle