| commit | e3060a0c4d2f418ac786775109d71e5843ccf42e | |
| author | Eli Zaretskii <eliz@gnu.org> | |
| Tue, 14 Oct 2014 18:10:37 +0000 (14 21:10 +0300) | ||
| committer | Eli Zaretskii <eliz@gnu.org> | |
| Tue, 14 Oct 2014 18:10:37 +0000 (14 21:10 +0300) | ||
| tree | 347b37fc39d0db9cd23b3e9f79ee81b4bbc40f08 | treesnapshot (tar.gz zip) |
| parent | 1a3eca0656bdb764200e10a4f264138e94b1f3ce | commitdiff |
| parent | 980d78b3587560c13a46aef352ed8d5ed744acf6 | commitdiff |
Merge from trunk and resolve conflicts.