Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Mon, 3 Jun 2013 23:34:27 +0000 (07:34 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Mon, 3 Jun 2013 23:34:27 +0000 (07:34 +0800)
commitc362f1950814689b0a6f03f0fa48b07784b90a16
treeecb082e3fcca890b57ddc42f733808cca5e782a3
parentd3ffe17c6f56435ebd2aca787122a3982ac5fcb2
parentb9110c6b2f796b5147b018c3d70df9d6af657eff
Merge from mainline.
doc/emacs/ChangeLog
lisp/ChangeLog