Merge branch 'MDL-27314' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:45:15 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 7 Dec 2011 23:45:15 +0000 (00:45 +0100)

Trivial merge