Merge branch 'MDL-50245' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:32:58 +0000 (00:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 May 2015 22:32:58 +0000 (00:32 +0200)

Trivial merge