From bff278b16a391d4290ace6bb327f46cf0fef446a Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Fri, 17 Aug 2012 18:25:42 -0700
Subject: [PATCH] add this week's fixes to changelog

---
 ChangeLog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a690fb71c..e5463cd07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 train-2012.08.17:
-  * Reseting your password now logs you out everywhere: #2026
+  * Reseting your password now logs you out everywhere: #2026, #2307
   * SCHEMA CHANGE: add TIMESTAMP lastPasswordReset to user table for #2026
   * CONFIG CHANGE: default statsd to false
   * Changes to allow devs to work on windows: #1751
@@ -28,6 +28,7 @@ train-2012.08.17:
   * RPM build fixes: #2249
   * API improvements (better error messages): #1438, #2255, #2228, #1659
   * .getVerifiedEmail() deprecated: #2267
+  * add a permanent redirect from /signup to /signin: issue #2277
 
 train-2012.07.30:
   * Emails are prettier!  They now include both HTML and Text versions: #1890
-- 
GitLab