User: drumm Branch: DRUPAL-6--1 Date: Tue, 11 May 2010 05:44:44 +0000 Modified files: /modules/api api.module /modules/api/templates api-class-page.tpl.php Log message: #757568 Merge inherited items into main lists. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/api/api.module&old... http://cvs.drupal.org/diff.php?path=contributions/modules/api/templates/api-...