User: hefox Branch: DRUPAL-6--2 Date: Tue, 22 Dec 2009 22:22:10 +0000 Modified files: /modules/dbscripts erase.php restore.php Log message: Cleaning ups related to merge conflicts Links: http://cvs.drupal.org/diff.php?path=contributions/modules/dbscripts/erase.ph... http://cvs.drupal.org/diff.php?path=contributions/modules/dbscripts/restore....