Merge branch 'MDL-29579' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 22:36:49 +0000 (23:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 22:36:49 +0000 (23:36 +0100)

Trivial merge