Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 29 Jun 2011 09:04:13 +0000 (17:04 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 29 Jun 2011 09:04:13 +0000 (17:04 +0800)
1  2 
lib/questionlib.php
mod/assignment/lib.php
mod/data/lib.php
mod/forum/lib.php
mod/glossary/lib.php
mod/lesson/lib.php
mod/quiz/lib.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge