Merge branch 'em_MDL-25944_20_forummail' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:42:45 +0000 (18:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:42:45 +0000 (18:42 +0100)
commit78106a24addfd14c08602adbf7147f2eabf82bd4
treedac3e654934b127bf65afc36ee9e0ea42ccaa1ba
parent395181f9bb2813fe4f133237f003de2b78ae7b3d
parent18ff4d427ee46c32dc6322e5643a98d15de905b7
Merge branch 'em_MDL-25944_20_forummail' of git://github.com/skodak/moodle