From: Nicolas Petton <nicolas@petton.fr>
Date: Thu, 4 Jun 2015 20:30:29 +0000 (+0200)
Subject: Merge branch 'map'
X-Git-Tag: emacs-25.0.90~1873
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d4aca72ead4c1e53819e6e3249e26400a9879a0e;p=emacs.git

Merge branch 'map'
---

d4aca72ead4c1e53819e6e3249e26400a9879a0e