reverted nntplib.py to work with 2.* and 3.*
reverted nntplib.py to another previous version
Merge remote-tracking branch 'upstream/master'