]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca9456f 4ab6e74)
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