thanks Koen,
note for later:

in login/token.php, remove the get_string() of this line:

add_to_log(SITEID, 'webservice', get_string('createtokenforuserauto', 'webservice'), '' , 'User ID: ' . $user->id);

and replace it by an english string. 'createtokenforuserauto' is most likely only use here, if it's the case remove the string from the lang file.

perfect, submitting. Integrator: can you cherry-pick 2.2 into 2.1, it should not create any conflict. Thank you.

The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

TIA and ciao

We really need a guidance document to point to developers and make the rules clear for this once and for all.

Yay, you didn't remove the strings from the stable branches, great work

Thanks Fred, thats been integrated now.

Ah! Just noticed, no testing instructions.

I added them

Thanks Fred, string looks fine.

FYI:
Log doesn't seem to be in order.
First log entry: webservice automatically create user token
Second log entry: webservice user request webservice token

IMO, it should be other way round. Passing this as this is not related to this fix.

Thanks Raj, I created http://tracker.moodle.org/browse/MDL-35636

Congratulations, you've done it!

Nf n erjneq sbe fhpprfshy vagrtengvba vagb guvf jrrxf eryrnfr, V pna abj qvfpybfr gb lbh gur rkvfgnapr bs shapgvba fge_ebg13(), gb tb va lbhe gbbyxvg nybat jvgu uggc://cuc.arg/znahny/ra/shapgvba.tmtrgff.cuc

Cyrnfr qb abg nyybj guvf vasbezngvba gb cnff shegure.