Merge branch 'fix_nginx_default_vhost' into boulder

This commit is contained in:
James Kasten
2015-04-23 14:08:09 -07:00
@@ -1 +1 @@
/etc/nginx/sites-available/default
../sites-available/default