[erlang/f13/master] (2 commits) ...Merge branch 'f13-emacs-hookup' into f13 (erlang-R13B-04.14)

[Hans Ulrich Niedermann]

Summary of changes:

  4faf855... Properly hook up (X)Emacs erlang-mode (#491165) (*)
  d1d41c6... Merge branch 'f13-emacs-hookup' into f13 (erlang-R13B-04.14 (*)

(*) This commit already existed in another branch; no separate mail sent