Merge branch 'MDL-27955_HEAD' of git://github.com/rwijaya/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 13:42:26 +0000 (15:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 13:42:26 +0000 (15:42 +0200)

Trivial merge