]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorFrancesc Rocher <francesc.rocher@gmail.com>
Thu, 29 Jan 2015 23:38:31 +0000 (00:38 +0100)
committerFrancesc Rocher <francesc.rocher@gmail.com>
Thu, 29 Jan 2015 23:38:31 +0000 (00:38 +0100)

Trivial merge