master updated (653503573c -> e536fb0851)

[Mattias Engdegård]

mattiase pushed a change to branch master.

      from  653503573c ; * lisp/bindings.el: Remove conflicting commented out 
bindings.
       new  ac1d15e95c ; * src/data.c (Fash): More precise doc string
       new  e536fb0851 Use `ash` instead of `lsh`


Summary of changes:
 lisp/files.el          | 2 +-
 lisp/image/exif.el     | 4 ++--
 lisp/term/haiku-win.el | 2 +-
 lisp/x-dnd.el          | 6 +++---
 src/data.c             | 4 +++-
 5 files changed, 10 insertions(+), 8 deletions(-)