Merge branch 'wip-mdl-41711' of git://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 18:22:32 +0000 (20:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 18:22:32 +0000 (20:22 +0200)

Trivial merge