Stable/1.6.x

.gitattributes

@@ -1,2 +1,5 @@
 # Normalize line endings to avoid spurious failures in the core test suite on Windows.
-*html text eol=lf
+*html text eol=lf
+*css text eol=lf
+tests/staticfiles_tests/apps/test/static/test/*txt text eol=lf
+tests/staticfiles_tests/project/documents/test/*txt text eol=lf

.gitignore

@@ -1,6 +1,7 @@
 *.egg-info
 *.pot
 *.py[co]
+__pycache__
 MANIFEST
 dist/
 docs/_build/

.hgignore

@@ -3,6 +3,7 @@ syntax:glob
 *.egg-info
 *.pot
 *.py[co]
+__pycache__
 docs/_build/
 tests/coverage_html/
-tests/.coverage
+tests/.coverage

AUTHORS

@@ -56,7 +56,9 @@ answer newbie questions, and generally made Django that much better:
 
     Gisle Aas <gisle@aas.no>
     Chris Adams
+    Christopher Adams <christopher.r.adams@gmail.com>
     Mathieu Agopian <mathieu.agopian@gmail.com>
+    Roberto Aguilar <roberto@baremetal.io>
     ajs <adi@sieker.info>
     alang@bright-green.com
     A S Alam <aalam@users.sf.net>
@@ -266,6 +268,7 @@ answer newbie questions, and generally made Django that much better:
     Janos Guljas
     Thomas Güttler <hv@tbz-pariv.de>
     Horst Gutmann <zerok@zerokspot.com>
+    Bouke Haarsma <bouke@haarsma.eu>
     Antti Haapala <antti@industrialwebandmagic.com>
     Scot Hacker <shacker@birdhouse.org>
     dAniel hAhler
@@ -437,6 +440,7 @@ answer newbie questions, and generally made Django that much better:
     Gopal Narayanan <gopastro@gmail.com>
     Fraser Nevett <mail@nevett.org>
     Sam Newman <http://www.magpiebrain.com/>
+    Alasdair Nicol <http://al.sdair.co.uk/>
     Ryan Niemeyer <https://profiles.google.com/ryan.niemeyer/about>
     Filip Noetzel <http://filip.noetzel.co.uk/>
     Afonso Fernández Nogueira <fonzzo.django@gmail.com>
@@ -464,6 +468,7 @@ answer newbie questions, and generally made Django that much better:
     phil@produxion.net
     phil.h.smith@gmail.com
     Gustavo Picon
+    Andrew Pinkham <http://AndrewsForge.com>
     Travis Pinney
     Michael Placentra II <someone@michaelplacentra2.net>
     plisk
@@ -540,6 +545,7 @@ answer newbie questions, and generally made Django that much better:
     smurf@smurf.noris.de
     Vsevolod Solovyov
     George Song <george@damacy.net>
+    Jimmy Song <jaejoon@gmail.com>
     sopel
     Leo Soto <leo.soto@gmail.com>
     Wiliam Alves de Souza <wiliamsouza83@gmail.com>
@@ -624,6 +630,7 @@ answer newbie questions, and generally made Django that much better:
     Derek Willis <http://blog.thescoop.org/>
     Rachel Willmer <http://www.willmer.com/kb/>
     Jakub Wilk <ubanus@users.sf.net>
+    Ian A Wilson <http://ianawilson.com>
     Jakub Wiśniowski <restless.being@gmail.com>
     Maciej Wiśniowski <pigletto@gmail.com>
     wojtek

django/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 6, 0, 'alpha', 1)
+VERSION = (1, 6, 2, 'alpha', 0)
 
 def get_version(*args, **kwargs):
     # Don't litter django/__init__.py with all the get_version stuff.

django/conf/global_settings.py

@@ -287,7 +287,7 @@
 
 # Absolute path to the directory static files should be collected to.
 # Example: "/var/www/example.com/static/"
-STATIC_ROOT = ''
+STATIC_ROOT = None
 
 # URL that handles the static files served from STATIC_ROOT.
 # Example: "http://example.com/static/", "http://static.example.com/"
@@ -469,6 +469,7 @@
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether a user's session cookie expires when the Web browser is closed.
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data
 SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If None, the backend will use a sensible default.
+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.JSONSerializer'  # class to serialize session data
 
 #########
 # CACHE #

django/conf/locale/__init__.py

@@ -279,7 +279,7 @@
         'bidi': False,
         'code': 'lt',
         'name': 'Lithuanian',
-        'name_local': 'Lithuanian',
+        'name_local': 'Lietuviškai',
     },
     'lv': {
         'bidi': False,
@@ -399,7 +399,7 @@
         'bidi': False,
         'code': 'sq',
         'name': 'Albanian',
-        'name_local': 'Albanian',
+        'name_local': 'shqip',
     },
     'sr': {
         'bidi': False,
@@ -441,7 +441,7 @@
         'bidi': False,
         'code': 'th',
         'name': 'Thai',
-        'name_local': 'Thai',
+        'name_local': 'ภาษาไทย',
     },
     'tr': {
         'bidi': False,
@@ -468,7 +468,7 @@
         'name_local': 'Українська',
     },
     'ur': {
-        'bidi': False,
+        'bidi': True,
         'code': 'ur',
         'name': 'Urdu',
         'name_local': 'اردو',
@@ -477,7 +477,7 @@
         'bidi': False,
         'code': 'vi',
         'name': 'Vietnamese',
-        'name_local': 'Vietnamese',
+        'name_local': 'Tiếng Việt',
     },
     'zh-cn': {
         'bidi': False,