From db3eb85249e1ae3f775c8cd6193fe0c0048c990e Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Fri, 3 Aug 2012 12:14:08 -0600
Subject: [PATCH] update changelog with merge of fix for issue #2122

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

diff --git a/ChangeLog b/ChangeLog
index f3f446fdf..ff6330f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 train-2012.07.30:
   * Emails are prettier!  They now include both HTML and Text versions: #1890
+  * (hotfix 2012.08.03) l10n fix, string extraction, email templates are moved: #2122
 
 train-2012.07.20:
   * Introduction of "static" process which serves views and static resources: #1757
diff --git a/scripts/browserid.spec b/scripts/browserid.spec
index 432bfd1e1..8f70b5cf0 100644
--- a/scripts/browserid.spec
+++ b/scripts/browserid.spec
@@ -2,7 +2,7 @@
 
 Name:          browserid-server
 Version:       0.2012.07.30
-Release:       1%{?dist}_%{svnrev}
+Release:       2%{?dist}_%{svnrev}
 Summary:       BrowserID server
 Packager:      Gene Wood <gene@mozilla.com>
 Group:         Development/Libraries
-- 
GitLab