merge trunk
commitf036e167feaf875873636972b28a4adc12c32254
authorKenichi Handa <handa@gnu.org>
Sat, 28 Jun 2014 01:35:48 +0000 (28 10:35 +0900)
committerKenichi Handa <handa@gnu.org>
Sat, 28 Jun 2014 01:35:48 +0000 (28 10:35 +0900)
tree440e45ae8951f7030393b130b184f2b1882070ee
parent1fc00e5c9e87c88b4b253692d6ade822f6d74d3e
parent2c4e2e6fd3096eb615504e3cfc89c588ec620f78
merge trunk
lisp/ChangeLog
lisp/international/characters.el