Merge branch 'MDL-30983' of git://github.com/rwijaya/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 16:04:53 +0000 (17:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 16:04:53 +0000 (17:04 +0100)

Trivial merge