Merge branch 'master_MDL-28111' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:36:28 +0000 (02:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Jul 2011 00:36:28 +0000 (02:36 +0200)

Trivial merge