Merge branch 'MDL-29095' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 11:05:36 +0000 (12:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 11:05:36 +0000 (12:05 +0100)

Trivial merge