diff --git a/VERSION b/VERSION index ca38b893..a31d7138 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.14.04.57.17 +Version 2.6.0-development+timestamp.2013.07.14.06.05.02 diff --git a/gluon/main.py b/gluon/main.py index 0ebeade1..470468fe 100644 --- a/gluon/main.py +++ b/gluon/main.py @@ -29,6 +29,9 @@ import tempfile import random import string import urllib2 +import locale +locale.setlocale(locale.LC_CTYPE, "C") # IMPORTANT, web2py requires locale "C" + try: import simplejson as sj #external installed library except: