Merge branch 'MDL-49006' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 18:32:40 +0000 (19:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 18:32:40 +0000 (19:32 +0100)

Trivial merge