Merge branch '44255-27' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 06:14:31 +0000 (14:14 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 25 Feb 2014 06:14:31 +0000 (14:14 +0800)
commit5c7a266e658215fa80ce456e0bdbe076c0c5b7b2
tree718bdaf4bb65f36a7158580e4f93133aeed3c160
parent03b8d9e3c3422dd540f11517d259aff2e7a37a2c
parenta2ed6e69f942e4fc3c4f983d530e8c1b1ea460ec
Merge branch '44255-27' of git://github.com/samhemelryk/moodle

Conflicts:
user/profile.php
user/lib.php
user/profile.php
user/view.php