Merge from origin/emacs-24
commitf95211e9a40b1c7d1beff0e15aa67450f80bd8bb
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 19 Jun 2015 23:45:50 +0000 (19 16:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 19 Jun 2015 23:45:50 +0000 (19 16:45 -0700)
treebd52fe0f6c5c04834f99759917137edf836e83cc
parentb9373ac26ad75fe38638a51eea54944163cc1c38
parenta5e6f33b4c8222ad62fdd7ff4bb0f8c5fac432c1
Merge from origin/emacs-24

a5e6f33 Fixes: debbugs:20832
b9f02cf Fixes: debbugs:20832
lisp/calendar/todo-mode.el