| commit | 94c48111c9e1543bafb012c2342847e343d82d4a | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Thu, 30 May 2013 19:51:00 +0000 (30 21:51 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Thu, 30 May 2013 19:51:00 +0000 (30 21:51 +0200) | ||
| tree | 711e628941fcc3d87ef0462f0d63f5a9053a5211 | treesnapshot (tar.gz zip) |
| parent | d574bf522d1b2ac74cb4245f8742253bde7861df | commitdiff |
| parent | 0f2ba793aace3fade6db121d34d6d548023f64d9 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ox-html.el
Conflicts:
lisp/ox-html.el
| lisp/ox-texinfo.el | diff1 | diff2 | blobhistory |