Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)
diff --cc theme/base/style/user.css
Simple merge
diff --cc user/profile.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)
		1	2
theme/base/style/user.css	patch \|	diff1 \|	diff2 \|	blob \| history
user/profile.php	patch \|	diff1 \|	diff2 \|	blob \| history