Merge branch 'dvsni_cleanup' of github.com:letsencrypt/lets-encrypt-preview into dvsni_cleanup

Conflicts:
	letsencrypt/client/apache/configurator.py
This commit is contained in:
James Kasten 2015-01-06 02:26:52 -08:00
commit 8eaeb1bc5e

Diff content is not available