Re-roll patches

• Needs reroll drupal.org/project/issues/search/drupal?issue_tags=Needs+reroll

• drupal.org/contributor-tasks/reroll

• drupal.org/patch/reroll

• kdiff3