remove jupi-related-stuff
fix
Merge branch 'master' into jupis

Conflicts:
	classes/connection/messagestream/nntp.class.php