Merge remote-tracking branch 'github/letsencrypt/master' into py2.6-3

1 files changed, 3 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 9fb58752a..40c6ac16c 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ install_requires = [
     'pytz',
     'requests',
     'setuptools',  # pkg_resources
+    'six',
     'zope.component',
     'zope.interface',
 ]
@@ -131,8 +132,8 @@ setup(
         'letsencrypt.plugins': [
             'manual = letsencrypt.plugins.manual:Authenticator',
             'null = letsencrypt.plugins.null:Installer',
-            'standalone = letsencrypt.plugins.standalone.authenticator'
-            ':StandaloneAuthenticator',
+            'standalone = letsencrypt.plugins.standalone:Authenticator',
+            'webroot = letsencrypt.plugins.webroot:Authenticator',
         ],
     },
 )