Merge branch 'w29_MDL-40571_m25_adminblocks' of https://github.com/skodak/moodle...
commited405efb4c686e7d80fe0732e30d763fddff6e90
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 22:26:51 +0000 (16 00:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 22:26:51 +0000 (16 00:26 +0200)
treefb03b1b9aae6af30d2023da4f2362ec8287b1e46
parent40aa1f4d88a75090de41a597c2028143c6a0f624
parentfe2577d19792e6b78c1821ed503fe78456035a6d
Merge branch 'w29_MDL-40571_m25_adminblocks' of https://github.com/skodak/moodle into MOODLE_25_STABLE