# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1330272517 -7200
# Node ID 950110f3f99fb069a9809e10a3b58dc06ce58583
# Parent  61f9aeb2129e10a12d88895527ffe1f1692e997d
merged changes from stable into beta

diff -r 61f9aeb2129e -r 950110f3f99f docs/contributing.rst
--- a/docs/contributing.rst	Sun Feb 26 01:25:38 2012 +0200
+++ b/docs/contributing.rst	Sun Feb 26 18:08:37 2012 +0200
@@ -17,6 +17,14 @@
 To run RhodeCode in a development version you always need to install the tip
 version of RhodeCode and the VCS library.
 
+after downloading RhodeCode make sure you run::
+
+    python setup.py develop
+
+command to install all required packages, and prepare development enviroment
+
+
+
 | Thank you for any contributions!
 |  Marcin
 
diff -r 61f9aeb2129e -r 950110f3f99f docs/theme/nature/layout.html
--- a/docs/theme/nature/layout.html	Sun Feb 26 01:25:38 2012 +0200
+++ b/docs/theme/nature/layout.html	Sun Feb 26 18:08:37 2012 +0200
@@ -10,5 +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>
 {% endblock %}}
diff -r 61f9aeb2129e -r 950110f3f99f rhodecode/lib/__init__.py
--- a/rhodecode/lib/__init__.py	Sun Feb 26 01:25:38 2012 +0200
+++ b/rhodecode/lib/__init__.py	Sun Feb 26 18:08:37 2012 +0200
@@ -232,9 +232,6 @@
     :returns: str object
     """
 
-    if not isinstance(unicode_, basestring):
-        return str(unicode_)
-
     if isinstance(unicode_, str):
         return unicode_