Merge branch 'MDL-27797_fixup' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jun 2011 16:18:26 +0000 (18:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jun 2011 16:18:26 +0000 (18:18 +0200)

Trivial merge