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

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

Revision: 38849
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=38849&view=rev
Author:   jonnybradley
Date:     2011-11-16 20:25:14 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
[MRG] Automatic merge, branches/8.x 38846 to 38847

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409,33409
/branches/7.x:33633-36216,36238,36257,36453
/branches/8.x:37900-38846
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/foreign-storage:34822-34895
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal:31497
/branches/proposals/4.x:24005
   + /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409,33409
/branches/7.x:33633-36216,36238,36257,36453
/branches/8.x:37900-38847
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/foreign-storage:34822-34895
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal:31497
/branches/proposals/4.x:24005

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