Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:51:13 +0000 (19:51 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:51:13 +0000 (19:51 +0200)
commit245ddcaa82a7778f662f28584eab8be48c7cfede
treeef41833e36492066f4e8e36d5ca4910686333826
parenta59f6567d06303117b5befc76988b4ace798ed8f
parent6aaca95125772b979d88fafc4c8d8b26c6ffcc5b
Merge from trunk.