| commit | a77118b3cad9bdda753ec0397233faabfc5018fa | |
| author | Bastien Guerry <bzg@altern.org> | |
| Wed, 18 Jun 2014 22:49:20 +0000 (19 00:49 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Wed, 18 Jun 2014 22:49:20 +0000 (19 00:49 +0200) | ||
| tree | 5ce96a3f8f34a9099ddf560ab9ff4c5940fd863f | treesnapshot (tar.gz zip) |
| parent | 8b959237fca518fbd6dc7cd36a67093e1ec1f00b | commitdiff |
| parent | 08a9587e0183fa2831ba0d5f084d49665f7bec0f | commitdiff |
Merge branch 'maint'
Conflicts:
contrib/lisp/ox-koma-letter.el
Conflicts:
contrib/lisp/ox-koma-letter.el
| contrib/lisp/ox-koma-letter.el | diff1 | diff2 | blobhistory |