Merge branch 'MDL-28604' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 07:41:53 +0000 (09:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Aug 2011 07:41:53 +0000 (09:41 +0200)

Trivial merge