Merge branch 'wip-mdl-41843' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 22:13:26 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 22:13:26 +0000 (00:13 +0200)

Trivial merge