Merge branch 'em_MDL-26476_20_grp' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:25:04 +0000 (18:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Feb 2011 17:25:04 +0000 (18:25 +0100)

Trivial merge