Merge branch 'MDL-46868' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 23:40:00 +0000 (01:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Aug 2014 23:40:00 +0000 (01:40 +0200)

Trivial merge