changed nzb retention for GrabNZBs to partretentionhours
oops
Merge pull request #720 from junkman690/master

Update RSS logo
Merge branch 'master' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge pull request #721 from junkman690/master

Remove RSS logo filecheck
added variable timeout to nntp.php
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge pull request #722 from nZEDb/dev

Dev
Merge remote-tracking branch 'upstream/master'