Merge branch 'MDL-29879' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Nov 2011 19:12:45 +0000 (20:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Nov 2011 19:12:45 +0000 (20:12 +0100)

Trivial merge