[contributions:sdboyer] /modules/ctools/includes context.inc /modules/ctools/js ajax-responder.js /modules/ctools/plugins/content_types/search search_result.inc

User: sdboyer Branch: HEAD Date: Tue, 07 Sep 2010 20:12:52 +0000 Modified files: /modules/ctools/includes context.inc /modules/ctools/js ajax-responder.js /modules/ctools/plugins/content_types/search search_result.inc Log message: Removing some merge remnants. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/includes/co... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/js/ajax-res... http://cvs.drupal.org/diff.php?path=contributions/modules/ctools/plugins/con...