Merge branch 'MDL-30186' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:11:29 +0000 (00:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:11:29 +0000 (00:11 +0100)

Trivial merge