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)
commita23a2ed19d68579c688dc6078458662671871b72
tree6b5f19526dcc91bf58340be996c7702ea3d9bb08
parentab870c7e698f1245662d6fd133185a09571c8301
parent50a01e0fc53e59b84dc5e657deb53a5a14e7ffd2
Merge branch 'wip-mdl-44262' of https://github.com/rajeshtaneja/moodle

Conflicts:
composer.json