Merge tag 'upstream/2.04'

Upstream version 2.04

diff --cc lib/HTML/CalendarMonth/DateTool.pm
index 0e752a3d5f9456c87045ba94b1f95d73ba68cf2a,702a30fcd5c75947a451b5636816ad44dbb7e0a5..e69328dbea19d42c932c7b84e83e7b9028a283f8
--- 1/lib/HTML/CalendarMonth/DateTool.pm
--- 2/lib/HTML/CalendarMonth/DateTool.pm
+++ b/lib/HTML/CalendarMonth/DateTool.pm
@@@ -450,7 -450,7 +450,11 @@@ methods are necessary
  
  For a given day, and optionally C<month> and C<year> if they are
  different from those specified in C<new()>, provide the day of week
++<<<<<<< HEAD
 +number. (1=Sunday, 7=Saturday).
++=======
+ number. (0=Sunday, 6=Saturday).
++>>>>>>> upstream/2.04
  
  =item add_days($days, $delta, $day, [$month], [$year])