Merge branch 'MDL-28049' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2011 13:56:03 +0000 (15:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2011 13:56:03 +0000 (15:56 +0200)

Trivial merge