Merge branch 'wip-mdl-27896' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 23:55:30 +0000 (01:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 23:55:30 +0000 (01:55 +0200)

Trivial merge