| commit | ef2d475bf8c0995ae8a0ced2c5262f48ad547dad | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Thu, 8 Aug 2013 16:49:17 +0000 (8 18:49 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Thu, 8 Aug 2013 16:49:17 +0000 (8 18:49 +0200) | ||
| tree | 2dfe629c7b95a5769a2576b00ec6c1f3e683a0ed | treesnapshot (tar.gz zip) |
| parent | 83b6cfcaec887ad9296f08f97e86e0ec69f73255 | commitdiff |
| parent | c82cb4f75e42bb1d0eadd13f18967a17598b8d65 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ox.el
Conflicts:
lisp/ox.el
| lisp/ox-publish.el | diff1 | diff2 | blobhistory |
| lisp/ox.el | diff1 | diff2 | blobhistory |