Merged bug 1000312 from production branch into default, since it was missing from default
Bug 1005133 - Reduce log retention on buildbot masters from 200 twistd.log files to 100 twistd.log files,r=catlee
Merge default -> production: Bug 1005133 - Reduce log retention on buildbot masters from 200 twistd.log files to 100 twistd.log files,r=catlee

--HG--
branch : production