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

Trivial merge