Merge branch 'MDL-30182' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 09:53:56 +0000 (10:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 09:53:56 +0000 (10:53 +0100)

Trivial merge