Merge branch 'master' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
added variable timeout to nntp.php
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev