[soc2009/admin-ui] Merging up to trunk svn:r11382 into my branch (thi…

…s time from the right directory)

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/admin-ui@11400 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -14,6 +14,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Robert Wittams
     * Gary Wilson
     * Brian Rosner
+    * Justin Bronn
     * Karen Tracey
 
 More information on the main contributors to Django can be found in
@@ -131,6 +132,7 @@ answer newbie questions, and generally made Django that much better:
     Andrew Durdin <adurdin@gmail.com>
     dusk@woofle.net
     Andy Dustman <farcepest@gmail.com>
+    J. Clifford Dyer <jcd@unc.edu>
     Clint Ecker
     Nick Efford <nick@efford.org>
     eibaan@gmail.com
@@ -199,6 +201,7 @@ answer newbie questions, and generally made Django that much better:
     Ian Holsman <http://feh.holsman.net/>
     Kieran Holland <http://www.kieranholland.com>
     Sung-Jin Hong <serialx.net@gmail.com>
+    Leo "hylje" Honkanen <sealage@gmail.com>
     Richard House <Richard.House@i-logue.com>
     Robert Rock Howard <http://djangomojo.com/>
     John Huddleston <huddlej@wwu.edu>
@@ -217,7 +220,7 @@ answer newbie questions, and generally made Django that much better:
     Michael Josephson <http://www.sdjournal.com/>
     jpellerin@gmail.com
     junzhang.jn@gmail.com
-    Antti Kaihola <http://akaihola.blogspot.com/>
+    Antti Kaihola <http://djangopeople.net/akaihola/>
     Bahadır Kandemir <bahadir@pardus.org.tr>
     Karderio <karderio@gmail.com>
     Nagy Károly <charlie@rendszergazda.com>
@@ -436,6 +439,7 @@ answer newbie questions, and generally made Django that much better:
     viestards.lists@gmail.com
     George Vilches <gav@thataddress.com>
     Vlado <vlado@labath.org>
+    Zachary Voase <zacharyvoase@gmail.com>
     Milton Waddams
     Chris Wagner <cw264701@ohio.edu>
     Rick Wagner <rwagner@physics.ucsd.edu>

django/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 1, 0, 'beta', 1)
+VERSION = (1, 2, 0, 'alpha', 0)
 
 def get_version():
     version = '%s.%s' % (VERSION[0], VERSION[1])
@@ -7,9 +7,8 @@ def get_version():
     if VERSION[3:] == ('alpha', 0):
         version = '%s pre-alpha' % version
     else:
-        version = '%s %s' % (version, VERSION[3])
         if VERSION[3] != 'final':
-            version = '%s %s' % (version, VERSION[4])
+            version = '%s %s %s' % (version, VERSION[3], VERSION[4])
     from django.utils.version import get_svn_revision
     svn_rev = get_svn_revision()
     if svn_rev != u'SVN-unknown':