merged beta into stable

rhodecode/lib/__init__.py

@@ -235,9 +235,6 b' def safe_str(unicode_, to_encoding=None)'
     if not isinstance(unicode_, basestring):
         return str(unicode_)
 
-    if not isinstance(unicode_, basestring):
-        return str(unicode_)
-
     if isinstance(unicode_, str):
         return unicode_