Merge branch 'MDL-28426' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 00:32:01 +0000 (01:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 00:32:01 +0000 (01:32 +0100)

Trivial merge