Merge branch 'master_MDL-28109' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 13:42:21 +0000 (15:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 13:42:21 +0000 (15:42 +0200)

Trivial merge