Merge branch 'w11_MDL-26621_20_profilemail' of git://github.com/skodak/moodle
commite9579e548de070bdcd5c3ef5a395fffa5814ae64
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Mar 2011 23:25:04 +0000 (14 00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Mar 2011 23:25:04 +0000 (14 00:25 +0100)
treef2788d483695cb84bc71ffeaabfd875af0593f75
parent5cd0d27089c766cb35eca7f854560f5dcac4b268
parent181991e791a13a3c383234718c26c499e31d3df1
Merge branch 'w11_MDL-26621_20_profilemail' of git://github.com/skodak/moodle