Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
commit36c0acaedd5f4646276e4edd7cb94248473d075a
authorJay Belanger <jay.p.belanger@gmail.com>
Fri, 10 Apr 2015 00:07:15 +0000 (9 19:07 -0500)
committerJay Belanger <jay.p.belanger@gmail.com>
Fri, 10 Apr 2015 00:07:15 +0000 (9 19:07 -0500)
tree916fad9979e778a581e85b1d9d602e11f108864e
parente368697ce3647f1f34f4777d553604866c56ad25
parent0679159c41a0c577cadf6b08f730e00f3c00931c
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs