Merge branch 'w02_MDL-37184_m25_editenrol' of git://github.com/skodak/moodle

author Dan Poltawski <dan@moodle.com>

Wed, 16 Jan 2013 02:19:57 +0000 (10:19 +0800)

committer Dan Poltawski <dan@moodle.com>

Wed, 16 Jan 2013 02:19:57 +0000 (10:19 +0800)
author Dan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 02:19:57 +0000 (10:19 +0800)
committer Dan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 02:19:57 +0000 (10:19 +0800)
diff --cc enrol/self/lang/en/enrol_self.php
Simple merge
diff --cc enrol/self/lib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Wed, 16 Jan 2013 02:19:57 +0000 (10:19 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Wed, 16 Jan 2013 02:19:57 +0000 (10:19 +0800)
		1	2
enrol/self/lang/en/enrol_self.php	patch \|	diff1 \|	diff2 \|	blob \| history
enrol/self/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history