Merge branch 'MDL-50277-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 May 2015 09:04:56 +0000 (11:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 May 2015 09:04:56 +0000 (11:04 +0200)

Trivial merge