Merge branch 'MDL-33400' of git://github.com/nebgor/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)
diff --cc mod/glossary/lib.php
Simple merge
diff --cc mod/quiz/lib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 12 Jun 2012 05:03:42 +0000 (13:03 +0800)
		1	2
mod/glossary/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/quiz/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history