Author: snoopdave
Date: Fri May 25 12:08:42 2007
New Revision: 541750
URL: http://svn.apache.org/viewvc?view=rev&rev=541750
Log:
Added note about merge to trunk
Modified:
roller/branches/roller_4.0_newbackend/merges.txt
Modified: roller/branches/roller_4.0_newbackend/merges.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diff&rev=541750&r1=541749&r2=541750
==============================================================================
--- roller/branches/roller_4.0_newbackend/merges.txt (original)
+++ roller/branches/roller_4.0_newbackend/merges.txt Fri May 25 12:08:42 2007
@@ -1,6 +1,11 @@
merges.txt
==========
+This branch has been merged back into Roller trunk and no further development
+will be done here. We'll keep it around for easy reference/archival purposes
+for a month or so and then remove it.
+
+
Temporary file to track merges from trunk into the roller_4.0_newbackend
branch.
May 24, 2007: final merge from trunk before merge back to trunk
