Merge branch 'wip-mdl-27964-master' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 13:07:07 +0000 (15:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 13:07:07 +0000 (15:07 +0200)

Trivial merge