Merge branch 'wip-mdl-44262' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:00:33 +0000 (12:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 May 2014 10:00:33 +0000 (12:00 +0200)
Conflicts:
composer.json


Trivial merge