Opps, sorry I did not give you the 'git author' credit for the string 'A city entered here will be the default city when creating new user accounts.', I thought the info in commit message would be enough. I will use my own strings next time, sorry. I have written the rest of the code myself - I just copy-pasted country code and added fixes for upload user and originally for auth plugins too, that is why I used myself as author and only gave you credit for the idea in the commit message.
Normally I would not file a PULL request myself, but it was the only chance to get this issue resolved in 2.0.2. I have discussed the defaultcity name with David and Eloy, we all agree that country was a bad string and setting name.
In any case I have added you to the list of ppl that are allowed to create PULL requests, please tell other developers to ping me if necessary. Next time this happens your PULL requests will be simply rejected and you will have time to rework or fix them so that you get all the due credit.
I am going to bring up the topic of authorship and handling of git contributions, it would be great if there were some solid guidelines for people doing the code reviews and integrations, it used to be a lot easier in the old CVS days, we are still learning the new and better git way....
Thanks a lot for your contribution and notifying us about this problem, I am looking forward to more PULL requests from you soon!