7 commits

Author	SHA1	Message	Date
Joona Hoikkala	0773f626f9	Resolved merge conflicts	2016-04-16 15:19:57 +03:00
Brad Warren	c9fdc926e0	Merge branch 'master' into fix-apache-conf-test	2016-04-14 18:40:51 -07:00
Brad Warren	75a1d81458	More stray ncrypt reference cleanup	2016-04-14 17:04:23 -07:00
Brad Warren	3a975ac580	Use command to find certbot path	2016-04-14 16:27:22 -07:00
Brad Warren	7472812edd	Reverted bad path change	2016-04-14 14:01:25 -07:00
Brad Warren	755dc2f08d	s/Let's Encrypt/Certbot certbot-apache	2016-04-13 16:36:53 -07:00
Brad Warren	2002511f81	s/letsencrypt/certbot letsencrypt-apache	2016-04-13 16:30:57 -07:00