Merge branch 'MDL-28129' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 23:41:38 +0000 (01:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 23:41:38 +0000 (01:41 +0200)

Trivial merge