]> code.delx.au - gnu-emacs/commitdiff
merge trunk
authorKenichi Handa <handa@gnu.org>
Tue, 31 Dec 2013 15:04:57 +0000 (00:04 +0900)
committerKenichi Handa <handa@gnu.org>
Tue, 31 Dec 2013 15:04:57 +0000 (00:04 +0900)

Trivial merge