Merge branch 'wip-mdl-35397' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:39:05 +0000 (00:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 22:39:05 +0000 (00:39 +0200)

Trivial merge