Merge branch 'MDL-27741' of git://github.com/rwijaya/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 17:35:41 +0000 (19:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2011 17:35:41 +0000 (19:35 +0200)

Trivial merge