James Kasten e000cfd7c6 Merge branch 'master' into revoker ...

Conflicts:
	letsencrypt/client/challenge_util.py
	letsencrypt/client/display.py
	letsencrypt/client/tests/challenge_util_test.py
	letsencrypt/client/tests/client_test.py
	letsencrypt/scripts/main.py

2015-02-02 19:02:38 -08:00

..

client

Merge branch 'master' into revoker

2015-02-02 19:02:38 -08:00

scripts

Merge branch 'master' into revoker

2015-02-02 19:02:38 -08:00

__init__.py

refactor conf.py, add comment about version syntax

2015-02-01 03:15:39 +01:00