Merge branch 'wip-mdl-30608' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 21:18:50 +0000 (22:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 21:18:50 +0000 (22:18 +0100)

Trivial merge