zope.interface
Merge branch 'master' into zope.interface

Conflicts:
	letsencrypt/client/augeas_configurator.py
	letsencrypt/client/interfaces.py
Merge branch 'master' into zope.interface

Conflicts:
	letsencrypt/client/recovery_token_challenge.py
Merge pull request #133 from kuba/zope.interface

zope.interface