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)
commit438193ef457ea0ab5824ffe87a036228ddf86940
tree3025adf903382fdec7102706a988770cac0c966e
parent83ab09a0010b8e620cdc22082d26229eb6e68433
parentb6d7cff65f9729b508bfa9d5a306572be42bc74e
Merge branch 'MDL-48910_block_my' of https://github.com/andyjdavis/moodle