| commit | 13b5123da1c0e5817422f5766599543785d30f3b | |
| author | Bastien Guerry <bzg@altern.org> | |
| Wed, 5 Feb 2014 15:16:36 +0000 (5 16:16 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Wed, 5 Feb 2014 15:16:36 +0000 (5 16:16 +0100) | ||
| tree | ff0e06bfcc97ec6710148db52111a3f3848233a3 | treesnapshot (tar.gz zip) |
| parent | 980c021609650bcbb20c6256a39de0e05ba30d96 | commitdiff |
| parent | a6f81047a47737b3450081e324c33ef00e681d36 | 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 |
| lisp/org.el | diff1 | diff2 | blobhistory |