Merge branch 'MDL-27827_head' of git://github.com/grabs/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:21:58 +0000 (00:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:21:58 +0000 (00:21 +0200)

Trivial merge