| commit | 2d18609f4aabbfbf0a3b1be093675de47c72a7c5 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Wed, 30 Jan 2013 11:11:10 +0000 (30 12:11 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Wed, 30 Jan 2013 11:11:10 +0000 (30 12:11 +0100) | ||
| tree | e895c2f347c9255eaadffda0ea9616010106a421 | treesnapshot (tar.gz zip) |
| parent | e54dce3b8c3141a8d8e01dd18564310b3d2408c5 | commitdiff |
| parent | e91a5dd33fa8b86aa252e79b8680fba53ea6aa0e | commitdiff |
Merge branch 'maint'
Conflicts:
contrib/lisp/org-e-odt.el
Conflicts:
contrib/lisp/org-e-odt.el
| contrib/lisp/org-e-odt.el | diff1 | diff2 | blobhistory |
| lisp/org-bibtex.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |