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

Trivial merge