Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 1 May 2013 17:12:42 +0000 (20:12 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 1 May 2013 17:12:42 +0000 (20:12 +0300)
commit9c1a1306117d5c41be1beac981d33085fa0fe5a1
tree0e3c9f92704930e26abcd7cab650a041ec0db3ac
parent2800c4d3155df0768410a675359fb360dfe2e791
parent584ea27747d10f9af3d4e3c022153a3d4fc87cc4
Merge from trunk.