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

Trivial merge