Merge from trunk.
commitb8ec977659df3970a6c8afb7a5b79c9b61e08307
authorEli Zaretskii <eliz@gnu.org>
Wed, 15 Oct 2014 13:16:10 +0000 (15 16:16 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 15 Oct 2014 13:16:10 +0000 (15 16:16 +0300)
tree58d317d79edc1406c8f50235062c86cb71ae18b5
parent48af58622bd07f37124a7b35f903b00de119f4a8
parent73d4c39e1519a5fec742686e3c81941113d41448
Merge from trunk.