Merge branch 'MDL-52814' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 15:48:04 +0000 (16:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 15:48:04 +0000 (16:48 +0100)
commitfa6426a0697d7a3b4421f8aafefc9664a2764f06
tree1984c42bfac85499d96967825601ff6c2dbf5432
parent85894eda018bb2d1f69aa3d201c1ef53cb3bcb69
parent97e9eb203eae0bcc9e55e96ac789e27fc173b444
Merge branch 'MDL-52814' of git://github.com/timhunt/moodle