Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle

author Dan Poltawski <dan@moodle.com>

Mon, 14 May 2012 02:28:05 +0000 (10:28 +0800)

committer Dan Poltawski <dan@moodle.com>

Mon, 14 May 2012 02:28:05 +0000 (10:28 +0800)
author Dan Poltawski <dan@moodle.com>
Mon, 14 May 2012 02:28:05 +0000 (10:28 +0800)
committer Dan Poltawski <dan@moodle.com>
Mon, 14 May 2012 02:28:05 +0000 (10:28 +0800)
diff --cc mod/quiz/lib.php
Simple merge
diff --cc mod/workshop/lib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Mon, 14 May 2012 02:28:05 +0000 (10:28 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Mon, 14 May 2012 02:28:05 +0000 (10:28 +0800)
		1	2
mod/quiz/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/workshop/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history