Merge pull request #543 from MITx/feature/arjun/fix_activation_domain

use the request's hostname rather than settings.SITE_NAME for activation emails

common/djangoapps/mitxmako/middleware.py

@@ -46,4 +46,4 @@ class MakoMiddleware(object):
         global requestcontext
         requestcontext = RequestContext(request)
         requestcontext['is_secure'] = request.is_secure()
-        requestcontext['site'] = settings.SITE_NAME
+        requestcontext['site'] = request.get_host()