Merge lp:~bialix/bzr-website/2.1.2 into lp:bzr-website

[Alexander Belchenko]

Update the version info on released versions to 2.1.2 / 2.2b4. I know there should be announcement of 2.2 very soon, but right now 2.1.2 is our stable version.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/27/2010 4:07 AM, Alexander Belchenko wrote:
> Alexander Belchenko has proposed merging lp:~bialix/bzr-website/2.1.2 into lp:bzr-website with lp:~bialix/bzr-website/win32 as a prerequisite.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
>
> Update the version info on released versions to 2.1.2 / 2.2b4. I know there should be announcement of 2.2 very soon, but right now 2.1.2 is our stable version.

Better than it is currently, though I would probably just jump the gun
for 2.2 if I was working on it.

John
=:->
 merge: approve

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkx39ccACgkQJdeBCYSNAAMOSACfdiu+edzNGyrsn/IkZK3pKPkv
/jEAoLxlyBL1vlXyaY5V3RvbPazc42qF
=D0np
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'build.py'
--- build.py	2010-08-27 09:07:40 +0000
+++ build.py	2010-08-27 09:07:40 +0000
@@ -3,8 +3,8 @@
 import time
 import feedparser
 
-STABLE_VERSION = "2.1.1"
-TEST_VERSION = "2.2b1"
+STABLE_VERSION = "2.1.2"
+TEST_VERSION = "2.2b4"
 
 
 PROJECTS = [
 
=== modified file 'en/index.html'
--- en/index.html	2010-08-27 09:07:40 +0000
+++ en/index.html	2010-08-27 09:07:40 +0000
@@ -78,8 +78,8 @@
   <div class="grid_4">
       <h1 id="page_title"><a href=".">Bazaar</a></h1>
       <table>
-          <tr><th align="left">Stable version:&nbsp;</th><td>2.1.1</td></tr>
-          <tr><th align="left">Test version:&nbsp;</th><td>2.2b1</td></tr>
+          <tr><th align="left">Stable version:&nbsp;</th><td>2.1.2</td></tr>
+          <tr><th align="left">Test version:&nbsp;</th><td>2.2b4</td></tr>
       </table>
   </div>
   <div class="grid_4 omega" id="carousel">