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)
1  2 
mod/glossary/lib.php
mod/lesson/lang/en/lesson.php
mod/lesson/lib.php
mod/quiz/lang/en/quiz.php
mod/quiz/lib.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge