commit 07fa1a0d962f672c7d4c7e86ca98738746855b3a
author jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Feb 02 21:02:43 2010 +0000
committer jat@google.com <jat@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Feb 02 21:02:43 2010 +0000
tree bd419d7f7cdf32d356a22cfb05a90b07b970e6ea
parent c17a570d3bf850047b76ba29d27640e021a19a2c

Add missing merge record.


git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.0@7520 8db76d5a-ed1c-0410-87a9-c151d255dfc7

branch-info.txt

diff --git a/branch-info.txt b/branch-info.txt
index a5d0cd6..93fc477 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -1463,3 +1463,9 @@
 trunk@7513 was merged into this branch
   Prevent MenuBar from losing focus when navigating to a new submenu.
   svn merge --ignore-ancestry -c 7513 http://google-web-toolkit.googlecode.com/svn/trunk .
+
+(out of order)
+trunk@7354 was merged into this branch
+  Fix cookie encoding problem
+  svn merge --ignore-ancestry -c 7354 \
+      https://google-web-toolkit.googlecode.com/svn/trunk .