Merge branch 'w42_MDL-29886_m22_md5js' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 14:51:53 +0000 (16:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 14:51:53 +0000 (16:51 +0200)

Trivial merge