diff --git a/docs/changelog.rst b/docs/changelog.rst
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -4,6 +4,20 @@
Changelog
=========
+1.3.6 (**2012-05-16**)
+----------------------
+
+news
+++++
+
+
+fixes
++++++
+
+- fixed no scm found warning
+- fixed __future__ import error on rcextensions
+- made simplejson required lib for speedup on JSON encoding
+
1.3.5 (**2012-05-10**)
----------------------
diff --git a/rhodecode/__init__.py b/rhodecode/__init__.py
--- a/rhodecode/__init__.py
+++ b/rhodecode/__init__.py
@@ -26,11 +26,11 @@
import sys
import platform
-VERSION = (1, 3, 5)
+VERSION = (1, 3, 6)
try:
from rhodecode.lib import get_current_revision
- _rev = get_current_revision()
+ _rev = get_current_revision(quite=True)
if _rev and len(VERSION) > 3:
VERSION += ('dev%s' % _rev[0],)
except ImportError:
@@ -65,10 +65,10 @@ requirements = [
"webob==1.0.8",
"markdown==2.1.1",
"docutils==0.8.1",
+ "simplejson==2.5.2",
]
if __py_version__ < (2, 6):
- requirements.append("simplejson")
requirements.append("pysqlite")
if is_windows:
diff --git a/rhodecode/config/rcextensions/make_rcextensions.py b/rhodecode/config/rcextensions/make_rcextensions.py
--- a/rhodecode/config/rcextensions/make_rcextensions.py
+++ b/rhodecode/config/rcextensions/make_rcextensions.py
@@ -22,12 +22,13 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+from __future__ import with_statement
+
import os
import sys
import pkg_resources
import traceback
import logging
-from __future__ import with_statement
from os.path import dirname as dn, join as jn
#to get the rhodecode import
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -100,8 +100,8 @@
%for book in cs.bookmarks:
${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
-
- %endfor
+
+ %endfor
%endif
%for tag in cs.tags: