From 6f8aed500890c395c18c7bc62b223999f1c60662 Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Fri, 25 May 2012 17:29:58 -0600
Subject: [PATCH] update changelog with recent merged changes for
 train-2012.05.25

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

diff --git a/ChangeLog b/ChangeLog
index 22c4f387b..e728fe30e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ train-2012.05.25 (in progress):
   * when user types in wrong password while verifying secondary address (on different browser), show clear tooltip style error: #1557
   * don't make a user type their password when not neccesary (adding secondary address to acct with only primary addresses): #1555
   * perform rigorous checking of inputs to dialog from RP. (PR #1627, bug #747859)
+  * support new parameter names in .get & .request APIs: #1643
+  * perform rigorous checking of arguments returned from primary IdPs: bug #758449
 
 train-2012.05.14:
   * Password is now requested in dialog for new user signup: #1000, #290
-- 
GitLab