[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[46994] trunk/

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

Revision: 46994
          http://sourceforge.net/p/tikiwiki/code/46994
Author:   jonnybradley
Date:     2013-08-06 12:52:07 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
[MRG] Automatic merge, branches/11.x 46966 to 46993

Property Changed:
----------------
    trunk/

Index: trunk
===================================================================
--- trunk	2013-08-06 12:49:39 UTC (rev 46993)
+++ trunk	2013-08-06 12:52:07 UTC (rev 46994)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
 /branches/10.x:43596-44410,44444-44836,44907
-/branches/11.x:45702-46966
+/branches/11.x:45702-46993
 /branches/3.0:16998-18916
 /branches/4.x:22817-23908
 /branches/5.x:26025-26523,26527-28378
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.