| commit | a24ac01cd53646fa0f622b998cdbddf8787a1713 | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Mon, 22 Sep 2014 15:43:30 +0000 (22 17:43 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Mon, 22 Sep 2014 15:43:30 +0000 (22 17:43 +0200) | ||
| tree | 0ec5c1ec54838e985c935571bcdcce3ffd997423 | treesnapshot (tar.gz zip) |
| parent | 7585fe449b0d8c8cf29f2721c89202b00de7cfe6 | commitdiff |
| parent | 05d8d76e74b0cfb0715c41a162ef98cb4b3022d8 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ox-latex.el
Conflicts:
lisp/ox-latex.el
| lisp/ox-latex.el | diff1 | diff2 | blobhistory |