removed original nginx tarball from source, fixed logrotate again
Merge branch 'dev'