Merge branch 'MDL-26496' of git://github.com/rwijaya/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Feb 2012 01:04:59 +0000 (02:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Feb 2012 01:04:59 +0000 (02:04 +0100)

Trivial merge