Merge from emacs-23 branch
authorChong Yidong <cyd@gnu.org>
Wed, 25 Jan 2012 05:55:01 +0000 (13:55 +0800)
committerChong Yidong <cyd@gnu.org>
Wed, 25 Jan 2012 05:55:01 +0000 (13:55 +0800)
commit14af5f7fc4d7557ee712d3b6a8b46d9034c2ff39
tree2551c79e5e10f80c99082649b4cf0739c1648c1e
parent0b21c100be8937efef4a5b51c67750c05cfe31e2
Merge from emacs-23 branch
src/ChangeLog
src/coding.c