# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1330272568 -7200
# Node ID abe75448253c3ad3388bbd01ef86f23f6d35f83b
# Parent  82a88013a3fdbf09b6911d774ebe6f55a50dffa9# Parent  950110f3f99fb069a9809e10a3b58dc06ce58583
merged beta into stable

diff -r 82a88013a3fd -r abe75448253c docs/contributing.rst
diff -r 82a88013a3fd -r abe75448253c docs/theme/nature/layout.html
--- a/docs/theme/nature/layout.html	Sun Feb 26 17:25:09 2012 +0200
+++ b/docs/theme/nature/layout.html	Sun Feb 26 18:09:28 2012 +0200
@@ -10,9 +10,9 @@
 	border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 	<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1">
 	</form>
-	<div style="padding:5px">
-    <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank">
-    <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
-    </div>	
+    <div style="padding:5px">
+     <a href="http://flattr.com/thing/167489/RhodeCode" target="_blank">
+     <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a>
+   </div>  
 </div>
 {% endblock %}}
diff -r 82a88013a3fd -r abe75448253c rhodecode/lib/__init__.py
--- a/rhodecode/lib/__init__.py	Sun Feb 26 17:25:09 2012 +0200
+++ b/rhodecode/lib/__init__.py	Sun Feb 26 18:09:28 2012 +0200
@@ -235,9 +235,6 @@
     if not isinstance(unicode_, basestring):
         return str(unicode_)
 
-    if not isinstance(unicode_, basestring):
-        return str(unicode_)
-
     if isinstance(unicode_, str):
         return unicode_