Merge remote-tracking branch 'hg/master'

Conflicts:
	postman/models.py
	postman/query.py
	postman/utils.py

diff --cc postman/models.py
Simple merge

diff --cc postman/tests.py
Simple merge

diff --cc postman/utils.py
index bcc67baa433be1e8f4804f6f2870afb72e9441bb,64dbacf825112621d214c553acd78f09c8d3c947..c23647f3ad6d4e787b749f94ed726e85c3a9f4e4
--- 1/postman/utils.py
--- 2/postman/utils.py
+++ b/postman/utils.py
@@@ -78,15 -73,14 +76,15 @@@ def email(subject_template, message_tem
      message = render_to_string(message_template, ctx_dict)
      # during the development phase, consider using the setting: EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
      send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, recipient_list, fail_silently=True)
 +    mail_admins(subject, message)
  
  
- def email_visitor(object, action):
+ def email_visitor(object, action, site):
      """Email a visitor."""
-     email('postman/email_visitor_subject.txt', 'postman/email_visitor.txt', [object.email], object, action)
+     email('postman/email_visitor_subject.txt', 'postman/email_visitor.txt', [object.email], object, action, site)
  
  
- def notify_user(object, action):
+ def notify_user(object, action, site):
      """Notify a user."""
      if action == 'rejection':
          user = object.sender