chg
Merge branch 'master' of https://github.com/ViaSat/hotcidr

Conflicts:
	HotCIDR/hotcidr/apply.py
	HotCIDR/hotcidr/fetch.py
	HotCIDR/hotcidr/gitlib.py