Merge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 12:14:59 +0000 (13:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Feb 2015 12:14:59 +0000 (13:14 +0100)

Trivial merge