Merge branch 'w07_MDL-26142_20_immediatelly' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 16:38:22 +0000 (17:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 16:38:22 +0000 (17:38 +0100)

Trivial merge