Merge branch 'wip-mdl-29104' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2011 11:29:58 +0000 (13:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2011 11:29:58 +0000 (13:29 +0200)

Trivial merge