Merge branch 'wip-MDL-30921-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 02:51:06 +0000 (10:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 02:51:06 +0000 (10:51 +0800)
commite830d6f98e9a36f954e1eeccad3ce60b1240907f
treeeb3941d4da3464c5fb91bc3db5bff0974238a76b
parent1191881888bcfa5128c2e12722dbd3600e6b8ec0
parent27e3057838841d2a54e12ddd483f0d1e1234dfd7
Merge branch 'wip-MDL-30921-m24' of git://github.com/samhemelryk/moodle
blocks/moodleblock.class.php
lib/outputrenderers.php