From: Alan Mackenzie <acm@muc.de>
Date: Sat, 22 Nov 2014 21:44:23 +0000 (+0000)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~413
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=239cd5b62759b23020cb308d993b7e26933943d7;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---

239cd5b62759b23020cb308d993b7e26933943d7