Merge branch 'MDL-25935-user_picture_fields' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 01:35:34 +0000 (09:35 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 01:35:34 +0000 (09:35 +0800)

Trivial merge