Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 18 Oct 2012 18:19:55 +0000 (20:19 +0200)
commit81f8ee3ff0b25c479c6a8095d32d762610009e29
treef5e9719730673fad05308d6d18923eb8afe5e73a
parent9e1821d3a2350a87de85d19208a63cfcd27d7b50
parent14145a1e84e9c84af22d66ed272bf1b28f597e24
Merge from trunk.
lisp/ChangeLog
src/ChangeLog