From 2d2cb1904d04b584f60e0495aaa3204c271dc6c2 Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Tue, 7 Feb 2012 11:15:16 -0700
Subject: [PATCH] document new hotfixes to train-2012.02.02

Conflicts:

	scripts/browserid.spec
---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f21a96fac..d9626bc25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,9 +17,10 @@ train-2011.02.02:
   * remember the users email as they move from screen to screen in the dialog: #984, #1001, #1002, #1003, #1004
   * secondary "cancel" style buttons have a smaller font: #1020
   * build fixes: #1021, #1024
+  * (hotfix 2012.02.07) add a l10n-all.json which holds all locales we'll be shipping to production
   * (hotfix 2012.02.07) Fix the missing email address in the "check your email" screen for the forgot password flow.  #1058
   * (hotfix 2012.02.07) Modify build process to pick up locales from a .json file
-
+  * (hotfix 2012.02.07) fix production-locales.sh script to defer to the environment for configuration
 
 train-2011.01.18:
   * support for 3rd party primary identity providers: #761, #904, #865
-- 
GitLab