From 8308470c8cff2eb36df5b206241018f49665e1af Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Mon, 23 Jan 2012 19:16:21 -0700
Subject: [PATCH] update changelog with hotfixes into train-2012.01.18, bump
 rpm version number

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

diff --git a/ChangeLog b/ChangeLog
index 6dd3d19e1..7e8d736cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ train-2011.01.18:
   * language/rendering refinements: #850, #439, #622, #818, #901, #630, #888, #345, #815
   * front end performance improvements: #899, #910
   * better UX for network timeouts: #905
+  * (hotfix 2012.01.23) Remove unwanted scrollbar in dialog: issue #947 
+  * (hotfix 2012.01.23) Fix black backgrounds on IE8: issue #929
+  * (hotfix 2012.01.23) fix broken transition to "check your email": #933, #934, #935
 
 train-2011.01.05:
   * client entropy pool mixes in randomness from server for better browser RNG: #298, #800
diff --git a/scripts/browserid.spec b/scripts/browserid.spec
index 0f7f1a708..c534a465e 100644
--- a/scripts/browserid.spec
+++ b/scripts/browserid.spec
@@ -1,7 +1,7 @@
 %define _rootdir /opt/browserid
 
 Name:          browserid-server
-Version:       0.2012.01.25
+Version:       0.2012.02.02
 Release:       1%{?dist}
 Summary:       BrowserID server
 Packager:      Pete Fritchman <petef@mozilla.com>
-- 
GitLab