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

Trivial merge