Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Tue, 10 Dec 2013 17:56:03 +0000 (19:56 +0200)
committerEli Zaretskii <eliz@gnu.org>
Tue, 10 Dec 2013 17:56:03 +0000 (19:56 +0200)
commit5bdc6977e3ab4b36646671754098df7e6ab92ad6
treedc240463c840e49e97c23fb58b9e2b3d4ad1f3f9
parenta5c9bbb3413d8eea89cb832040a0ef6cd704dcfe
parente8374b3959e3fc809b7834e3b85245928ae83774
Merge from trunk.