Merge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 16:31:01 +0000 (18:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 16:31:01 +0000 (18:31 +0200)

Trivial merge