]> code.delx.au - gnu-emacs/commitdiff
Merge remote-tracking branch 'origin/emacs-24' into emacs-24
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 29 Jan 2015 02:29:55 +0000 (02:29 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 29 Jan 2015 02:29:55 +0000 (02:29 +0000)

Trivial merge