Merge branch 'MDL-28012' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:31:53 +0000 (00:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:31:53 +0000 (00:31 +0200)

Trivial merge