Merge branch 'MDL-28629' of git://github.com/mouneyrac/moodle

diff --cc lang/en/webservice.php
Simple merge

diff --cc login/token.php
Simple merge

diff --cc webservice/lib.php
Simple merge