Merge remote-tracking branch 'origin/2.5' into 2.5

textile · Nov 5, 2013 · ac8ef13 · ac8ef13
2 parents 75f5e95 + 0b20d2e
commit ac8ef13
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README.textile b/README.textile
@@ -11,7 +11,7 @@ h2. Branches
 
 *This is the README for the 2.5 branch.*
 
-Currently both branches are feature synchronised at the point they are tagged, and new features and bugfixes will go into both branches (where possible) for the time being, but this _will_ change at some point in the future.
+Currently both branches are feature synchronised at the point they are tagged, and new features and bugfixes go into both branches. *This _will_ change after the v2.5.4 release at which point the 2.5 branch will be feature frozen.*
 
 From time to time other branches may be present in the repository. These represent transient development or hotfix branches and should not be used for live sites/projects.