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

Revision: 42331
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=42331&view=rev
Author:   jonnybradley
Date:     2012-07-10 15:05:01 +0000 (Tue, 10 Jul 2012)
Log Message:
-----------
[MRG] Automatic merge, branches/9.x 42312 to 42328

Modified Paths:
--------------
    trunk/installer/schema/999999991_decode_pages_sources_tiki.php
    trunk/installer/schema/99999999_image_plugins_kill_tiki.php
    trunk/lib/core/Search/ContentSource/TrackerItemSource.php
    trunk/lib/core/Tracker/Field/Abstract.php
    trunk/lib/core/Tracker/Field/ItemLink.php
    trunk/lib/menubuilder/menulib.php
    trunk/lib/prefs/feature.php
    trunk/lib/prefs/search.php
    trunk/lib/setup/cookies.php
    trunk/lib/wiki-plugins/wikiplugin_subscribegroup.php
    trunk/templates/admin/include_search.tpl
    trunk/templates/filter.tpl
    trunk/templates/register-groupchoice.tpl
    trunk/templates/tiki-calendar_edit_item.tpl
    trunk/templates/tiki-searchindex.tpl
    trunk/templates/tiki-searchresults.tpl

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