Merge branch 'MDL-25886-user_picture_fields' of git://github.com/mudrd8mz/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 12:43:00 +0000 (13:43 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 12:43:00 +0000 (13:43 +0100)

Trivial merge