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
Minor style updates to default and simple theme
Merge pull request #872 from sinfuljosh/master

Minor style updates to default and simple theme
Could be the issue?
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.*
Merge remote-tracking branch 'upstream/master'
Merge