Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)
commitd452f49cf9403fa5a2a53b649fef3b4896e49760
treeaed7362effe2a8acaee164f319875311f090b9f8
parent0645eb68661435cf205f71aaca7f178d51e8532f
parente89682d8226825d39c1c0905b18cab273a35cf55
Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle
lang/en/moodle.php
user/index.php
user/profile.php