Record releases/1.6->trunk merge, and special build-break fix already
committed to trunk so it won't be merged again.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@3879 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt
index 2666543..679251a 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -8,5 +8,7 @@
Merges:
/trunk revisions c3688,c3703,c3700,c3704,c3707,c3715,c3717,c3724,3725 were merged (r3739) into this branch
/releases/1.5/@r3630:3863 was merged (r3864) into this branch
+/releases/1.6/@r3739:3876 was merged (r3877) into trunk
+r3878 was a build-break fix committed to trunk in r3877, and should not be merged to trunk
----> The next merge into trunk will be 3739:HEAD
+---> The next merge into trunk will be 3879:HEAD
