Merge branch 'MDL-50394_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 16:32:45 +0000 (18:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jun 2015 16:32:45 +0000 (18:32 +0200)

Trivial merge