User: rbrandon Branch: DRUPAL-6--2 Date: Tue, 18 Jan 2011 16:04:14 +0000 Modified files: /modules/openscholar_vsite/cp cp.module /modules/openscholar_vsite/vsite_menus vsite_menus.module /modules/openscholar_vsite/vsitehelp vsitehelp.module Log message: fix cp conflict Links: http://cvs.drupal.org/diff.php?path=contributions/modules/openscholar_vsite/... http://cvs.drupal.org/diff.php?path=contributions/modules/openscholar_vsite/... http://cvs.drupal.org/diff.php?path=contributions/modules/openscholar_vsite/...