Merge remote-tracking branch 'upstream/master' into dev
Merge remote-tracking branch 'upstream/master' into dev
fixed bug in pp, upgraded NNTP
reverted some postprocessing changes
added retry to nntp.php, added timeout to Client.php
adjusted retry
Minor change to smarty default permissions, Fix Utils for checkall
Merge pull request #601 from sinfuljosh/dev

Minor change to smarty default permissions, Fix Utils for checkall
when considering min size for category, use parent min size if child is set to zero
fix error
Merge pull request #602 from bfincher/dev

Category min size enhancement
minor tweaks
Merge pull request #604 from nZEDb/dev

Dev - upgraded nntp and reverted some pp changes
forgot this
Merge pull request #605 from nZEDb/dev

Dev - dunno why these didn't merge the last time
Fix Smarty White Page of Doom Error on Login
Merge pull request #606 from sinfuljosh/dev

Fix Smarty White Page of Doom Error on Login
Merge pull request #607 from nZEDb/dev

Dev
fixed bug in rarinfo and monitor
Merge pull request #608 from nZEDb/dev

fixed bug in rarinfo and monitor