Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)

committer Dan Poltawski <dan@moodle.com>

Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)
author Dan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)
committer Dan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)
diff --cc lang/en/moodle.php
Simple merge
diff --cc user/index.php
Simple merge
diff --cc user/profile.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)
		1	2
lang/en/moodle.php	patch \|	diff1 \|	diff2 \|	blob \| history
user/index.php	patch \|	diff1 \|	diff2 \|	blob \| history
user/profile.php	patch \|	diff1 \|	diff2 \|	blob \| history