[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[33636] trunk/tests/testfile.txt

[<jon...@us...>]

Revision: 33636
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=33636&view=rev
Author:   jonnybradley
Date:     2011-03-24 18:17:16 +0000 (Thu, 24 Mar 2011)

Log Message:
-----------
[MRG] fake merge, branches/7.x 0 to 33632

Modified Paths:
--------------
    trunk/tests/testfile.txt

Modified: trunk/tests/testfile.txt
===================================================================
--- trunk/tests/testfile.txt	2011-03-24 17:56:53 UTC (rev 33635)
+++ trunk/tests/testfile.txt	2011-03-24 18:17:16 UTC (rev 33636)
@@ -10,3 +10,4 @@
 start merge 6.x
 trying netbeans
 certificate accept
+start merge for 7.x


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.