master updated (fc4d3ee -> 8695791)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  fc4d3ee   Revert "Add support for "bright" ANSI colors in 
ansi-color"
       new  e4ec39e5  Make dired-chmod-program obsolete
       new  8695791   timeclock.el: Update example configuration


Summary of changes:
 lisp/calendar/timeclock.el | 14 +++++++-------
 lisp/dired.el              |  7 +++----
 lisp/net/ange-ftp.el       |  3 +--
 3 files changed, 11 insertions(+), 13 deletions(-)