Merge branch 'MDL-28055' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 22:02:51 +0000 (00:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 22:02:51 +0000 (00:02 +0200)

Trivial merge