Merge from trunk
commitdaf2586e5ea6a41fd5529b05376d1ecb4e29af97
authorMartin Rudalics <rudalics@gmx.at>
Tue, 11 Jan 2011 16:05:26 +0000 (11 17:05 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Tue, 11 Jan 2011 16:05:26 +0000 (11 17:05 +0100)
tree6d44448928eff58582afba51064e99b9f8aa58dc
parent32b24bc8d1653cab931b09570bbfc4249993b945
parent04380ff1b8d938ff37e370ba7305d38ab7671cb7
Merge from trunk
doc/lispref/ChangeLog
lisp/ChangeLog
lisp/cus-edit.el
src/ChangeLog