Merge branch 'MDL-49159' of https://github.com/spvickers/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2015 23:17:37 +0000 (00:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Mar 2015 23:17:37 +0000 (00:17 +0100)

Trivial merge