Merge branch 'MDL-47943-master' of https://github.com/dthies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 17:44:38 +0000 (18:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 17:44:38 +0000 (18:44 +0100)

Trivial merge