Merge branch 'dev' of github.com:nZEDb/nZEDb
Merge branch 'dev' of github.com:nZEDb/nZEDb
Merge branch 'master' of github.com:nZEDb/nZEDb
Fix to sidewide and rage id RSS

Please double check this will work before comiting. I have experienced
no issues, but thats not saying its correct.
Revert "Fix to sidewide and rage id RSS"

This reverts commit 129852b619979431b60aa1566954ca1c79a3f4db.
Merge branch 'master' of github.com:nZEDb/nZEDb
Merge branch 'master' of github.com:nZEDb/nZEDb
Merge branch 'master' of https://github.com/junkman690/nZEDb
updated schema to match patch level
Added fix from dev
Merge pull request #894 from junkman690/master

Search fix from dev
reverted nntplib.py to work with 2.* and 3.*
reverted nntplib.py to another previous version
little cleanup
manually adding bug fixes/changes by bblanchon - merge requests go through dev branch
Merge branch 'master' of github.com:nZEDb/nZEDb
rewrite
typo
Merge branch 'dev'

Conflicts:
	db/schema.mysql
	misc/update_scripts/threaded_scripts/backfill_safe_threaded.py
	www/install/step3.php
	www/lib/nntp.php
	www/lib/releases.php
	www/pages/getnzb.php
merging dev to master