Merge branch 'MDL-28115' of git://github.com/rwijaya/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 15:09:42 +0000 (17:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 15:09:42 +0000 (17:09 +0200)

Trivial merge