User: kreynen Branch: DRUPAL-6--2 Date: Mon, 20 Dec 2010 22:28:30 +0000 Modified files: /modules/merci merci.module /modules/merci/modules/merci_staff merci_staff.module Log message: added overide option to merci_staff Links: http://cvs.drupal.org/diff.php?path=contributions/modules/merci/merci.module... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/modules/merc...