Merge branch 'master' into boulder

Conflicts:
	letsencrypt/acme/jose/json_util.py
	letsencrypt/acme/jose/jwk.py
	letsencrypt/acme/messages2_test.py
This commit is contained in:
James Kasten
2015-04-19 20:33:20 -07:00
20 changed files with 278 additions and 208 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ install_requires = [
'PyOpenSSL',
'pyrfc3339',
'python-augeas',
'python2-pythondialog',
'python2-pythondialog>=3.2.2rc1', # Debian squeeze support, cf. #280
'pytz',
'requests',
'werkzeug',