Merge branch 'wip-mdl-26281-master' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jun 2011 12:27:46 +0000 (14:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jun 2011 12:27:46 +0000 (14:27 +0200)

Trivial merge