Merge branch 'MDL-47266' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:12:16 +0000 (01:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Sep 2014 23:12:16 +0000 (01:12 +0200)

Trivial merge