| commit | 116a66c5bea451fff291fe26ab742b845cde288b | |
| author | Bastien Guerry <bzg@altern.org> | |
| Mon, 1 Jul 2013 21:13:03 +0000 (1 23:13 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Mon, 1 Jul 2013 21:13:03 +0000 (1 23:13 +0200) | ||
| tree | 0b3e52dc55d253fcf0493906b60af7aee8c9e780 | treesnapshot (tar.gz zip) |
| parent | 818e865db8ee47fc28cd22434e7db330e26c4526 | commitdiff |
| parent | c419d1134ec39cf929d58cf1b7befdd3a0677085 | commitdiff |
Merge branch 'maint'
| lisp/org.el | diff1 | diff2 | blobhistory |
| lisp/ox-odt.el | diff1 | diff2 | blobhistory |