]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c081fe2 bd6c441)
Merge remote-tracking branch 'origin/emacs-24'
authorAndreas Schwab <schwab@linux-m68k.org>
Sat, 13 Dec 2014 10:45:10 +0000 (11:45 +0100)
committerAndreas Schwab <schwab@linux-m68k.org>
Sat, 13 Dec 2014 10:45:10 +0000 (11:45 +0100)

Trivial merge