Merge branch 'MDL-37012-master' of git://github.com/mouneyrac/moodle

author Damyon Wiese <damyon@moodle.com>

Tue, 12 Feb 2013 06:39:20 +0000 (14:39 +0800)

committer Damyon Wiese <damyon@moodle.com>

Tue, 12 Feb 2013 06:39:20 +0000 (14:39 +0800)
author Damyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 06:39:20 +0000 (14:39 +0800)
committer Damyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 06:39:20 +0000 (14:39 +0800)
diff --cc lib/formslib.php
Simple merge
diff --cc theme/base/style/core.css
Simple merge
author	Damyon Wiese <damyon@moodle.com>
	Tue, 12 Feb 2013 06:39:20 +0000 (14:39 +0800)
committer	Damyon Wiese <damyon@moodle.com>
	Tue, 12 Feb 2013 06:39:20 +0000 (14:39 +0800)
		1	2
lib/formslib.php	patch \|	diff1 \|	diff2 \|	blob \| history
theme/base/style/core.css	patch \|	diff1 \|	diff2 \|	blob \| history