Hello,

one of the recent updates

  commit d6e40fb3472761ed51795f54491b969976167116
  
to org has caused a problem with the latest emacs snapshot (version from
5 January I believe).  Specifically, the alias for
list-diary-entries-hook would appear to create an alias loop as
diary-lib.el in emacs already has an alias.

Removing two lines from org-agenda.el (patch attached) fixes the problem
(for me).  I am not suggesting this as a patch as it would appear that
an emacs version specific check should probably be made?  I don't know
enough about this to suggest a proper solution unfortunately.

thanks,
eric