Merge branch 'MDL-27045' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 02:01:50 +0000 (03:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 02:01:50 +0000 (03:01 +0100)

Trivial merge