merge trunk
commit7e67809332c7ac0c798eb13d5573a5804db8134e
authorKenichi Handa <handa@gnu.org>
Sat, 20 Jul 2013 11:51:53 +0000 (20 20:51 +0900)
committerKenichi Handa <handa@gnu.org>
Sat, 20 Jul 2013 11:51:53 +0000 (20 20:51 +0900)
treeee8d4702ed94e7179ae30740f6575ca698539d30
parent0efe47a860bba25617132f02e2220056bfa098b0
parent6b1b199dc0e3e7f8028fabe87fac446f5a845479
merge trunk
lisp/ChangeLog
src/ChangeLog
src/coding.c