Merge branch 'MDL-52576_user_profile' of https://github.com/BenKelada/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 15:06:17 +0000 (15:06 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jan 2016 15:06:17 +0000 (15:06 +0000)

Trivial merge