[Emacs-diffs] master updated (b9373ac -> f95211e)

[Paul Eggert]

eggert pushed a change to branch master.

      from  b9373ac   Fix file-in-directory-p when the directory is UNC
      adds  b9f02cf   Fixes: debbugs:20832
      adds  a5e6f33   Fixes: debbugs:20832
       new  f95211e   Merge from origin/emacs-24


Summary of changes:
 lisp/calendar/todo-mode.el |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)