From: Karel Zak <kzak@redhat.com>
Date: Tue, 28 May 2013 13:23:59 +0000 (+0200)
Subject: Merge branch 'cal-fourth' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.24-rc1~535
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b947210258580d06242283d25f28d3a0b2100b9c;p=thirdparty%2Futil-linux.git

Merge branch 'cal-fourth' of git://github.com/kerolasa/lelux-utiliteetit

* 'cal-fourth' of git://github.com/kerolasa/lelux-utiliteetit:
  docs: cal: stop telling year 9999 is upper limit
  tests: check cal works when year is far in future
  cal: remove arbitrary limit of maxium year being 9999
  cal: use Claus Tøndering's day of the week algorithm
  cal: simplify day_in_week() calculation
  cal: mark all functions static
  cal: stop trimming whitespaces
  tests: add cal day color corner cases
  docs: cal: add --color option description to manual page
  cal: add --color to usage()
  cal: support --color[={auto,always,never}]
  cal: de-duplicate julian specific functions
  cal: remove unnecessary initializations
  cal: simplify calendar reformat calculations
  tests: add calendar reformation check
  cal: clean up use of constants
  cal: convert function like definitions to functions
  cal: fix preprocessor directive indendation
---

b947210258580d06242283d25f28d3a0b2100b9c