Emacs.org 20131220up

fix
Merge pull request #2 from firstar/patch-2

Emacs.org 20131220up