Merge branch 'master_MDL-27624' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 17:04:44 +0000 (19:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 17:04:44 +0000 (19:04 +0200)

Trivial merge