User: kreynen Branch: DRUPAL-6--2 Date: Wed, 30 Jun 2010 18:33:02 +0000 Modified files: /modules/merci merci.module /modules/merci/modules/merci_permissions merci_permissions.module /modules/merci/modules/merci_printable_contract merci_printable_contract.module Log message: reworked the admin menu structure so contract and permsisions show up as tabs in the main MERCI admin form. Moved the funcationality that moved MERCI under Open Media System into om_project 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... http://cvs.drupal.org/diff.php?path=contributions/modules/merci/modules/merc...