Merge branch 'MDL-23580' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 14:46:35 +0000 (16:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 14:46:35 +0000 (16:46 +0200)

Trivial merge