| commit | 24dea073bc974a22000f2eac9217afcfc5da9882 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Thu, 20 Dec 2012 17:56:27 +0000 (20 18:56 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Thu, 20 Dec 2012 17:56:27 +0000 (20 18:56 +0100) | ||
| tree | a60b2789df9465a527ca8dce529d432cf7f6272a | treesnapshot (tar.gz zip) |
| parent | a14d2673a77d860d92f48bc4064a0272d483169f | commitdiff |
| parent | 2824e1fd1de67d7797726c13c32d68457100efb6 | commitdiff |
Merge branch 'maint'
Conflicts:
testing/lisp/test-ob-exp.el
Conflicts:
testing/lisp/test-ob-exp.el
| lisp/org-html.el | diff1 | diff2 | blobhistory |
| lisp/org-publish.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-ob-exp.el | diff1 | diff2 | blobhistory |