Normalize line endings
Merge branch 'master' of github.com:zenoss/zenoss-zep
Merge branch 'develop' of https://github.com/zenoss/zenoss-zep into develop