Merge branch 'wip-MDL-27400-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 May 2011 00:04:34 +0000 (02:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 May 2011 00:04:34 +0000 (02:04 +0200)

Trivial merge