Merge branch 'MDL-52806' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Feb 2016 22:04:43 +0000 (23:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Feb 2016 22:04:43 +0000 (23:04 +0100)

Trivial merge