Merge branch 'w27_MDL-25954_m22_cohortnav' of git://github.com/skodak/moodle

author Sam Hemelryk <sam@moodle.com>

Mon, 11 Jul 2011 08:20:03 +0000 (16:20 +0800)

committer Sam Hemelryk <sam@moodle.com>

Mon, 11 Jul 2011 08:20:03 +0000 (16:20 +0800)
author Sam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 08:20:03 +0000 (16:20 +0800)
committer Sam Hemelryk <sam@moodle.com>
Mon, 11 Jul 2011 08:20:03 +0000 (16:20 +0800)
diff --cc cohort/assign.php
Simple merge
diff --cc cohort/index.php
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Mon, 11 Jul 2011 08:20:03 +0000 (16:20 +0800)
committer	Sam Hemelryk <sam@moodle.com>
	Mon, 11 Jul 2011 08:20:03 +0000 (16:20 +0800)
		1	2
cohort/assign.php	patch \|	diff1 \|	diff2 \|	blob \| history
cohort/index.php	patch \|	diff1 \|	diff2 \|	blob \| history