I'd just commit authorship information to the Javadoc of the affected code. I don't think it matters too much what happened in the git history as long as the current version of the code is correct.
- [freenet-dev] Attribution foulup - do we need to do a for... Matthew Toseland
- [freenet-dev] Attribution foulup - do we need to do ... xor