Merge branch 'MDL-51495' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 15:56:27 +0000 (16:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Nov 2015 15:56:27 +0000 (16:56 +0100)

Trivial merge