Merge remote-tracking branch 'hg/master'

Conflicts:
	postman/tests.py

diff --cc postman/models.py
index 59be98f280a1a9b00e652c16322f4faf2378047a,a819f71d386196767dd94855aaed931ba9598081..8bf0339cb651836eaa8c8c9def29da7dc6928adb
--- 1/postman/models.py
--- 2/postman/models.py
+++ b/postman/models.py
@@@ -72,16 -74,15 +74,16 @@@ def get_user_representation(user)
          if callable(attr):
              attr = attr()
          if attr:
-             return unicode(attr)
+             return force_text(attr)
      elif callable(show_user_as):
          try:
-             return unicode(show_user_as(user))
+             return force_text(show_user_as(user))
          except:
              pass
-     return unicode(user)  # default value, or in case of empty attribute or exception
+     return force_text(user)  # default value, or in case of empty attribute or exception
  
 -
 +# import logging
 +# logging.getLogger('django.db.backends').setLevel(logging.DEBUG)
  class MessageManager(models.Manager):
      """The manager for Message."""
  

diff --cc postman/utils.py
Simple merge