User: emackn Branch: DRUPAL-5 Date: Sat, 24 Nov 2007 12:51:38 +0000 Modified files: /modules/promote_blocks promote_blocks.install Log message: fixed conflict Links: http://cvs.drupal.org/diff.php?path=contributions/modules/promote_blocks/pro...