Merge branch 'MDL-26861' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 19:59:32 +0000 (20:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2011 19:59:32 +0000 (20:59 +0100)

Trivial merge