User: johnalbin Branch: DRUPAL-6--2 Date: Thu, 14 Oct 2010 18:16:27 +0000 Modified files: /themes/zen CHANGELOG.txt template.php Log message: #634552 by JohnAlbin and tim.plunkett: Conflict with context module Links: http://cvs.drupal.org/diff.php?path=contributions/themes/zen/CHANGELOG.txt&o... http://cvs.drupal.org/diff.php?path=contributions/themes/zen/template.php&ol...