Merge branch 'master' into reverter

Conflicts:
	letsencrypt/client/apache/configurator.py
	letsencrypt/client/crypto_util.py
	letsencrypt/client/display.py
	letsencrypt/client/revoker.py
	letsencrypt/client/tests/apache/configurator_test.py
	letsencrypt/client/tests/apache/dvsni_test.py
	letsencrypt/scripts/main.py
This commit is contained in:
James Kasten
2015-01-24 21:42:26 -08:00
27 changed files with 214 additions and 210 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
:mod:`letsencrypt.client.auth_handler`
--------------------------------
--------------------------------------
.. automodule:: letsencrypt.client.auth_handler
:members:
+1 -1
View File
@@ -1,5 +1,5 @@
:mod:`letsencrypt.client.client_authenticator`
--------------------------------
----------------------------------------------
.. automodule:: letsencrypt.client.client_authenticator
:members: