Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 Jul 2011 09:51:26 +0000 (11:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 1 Jul 2011 09:51:26 +0000 (11:51 +0200)
commit67fcc9989a38505d3ffad4bde8d37855c3c42f48
tree15df3ac5278e3f57602b094fd53469002145a348
parent3bd43d3d5c9b6f20dee8ac381954db33692776c7
parent2f9bdadfd23321951a7fbf7a33ddc5af57c5ef74
Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
mod/glossary/lib.php
mod/lesson/lang/en/lesson.php
mod/lesson/lib.php
mod/quiz/lang/en/quiz.php
mod/quiz/lib.php