| commit | b8ba8cbe3662777122baa3ac9f709eeb29857db5 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Thu, 17 Apr 2014 15:11:35 +0000 (17 17:11 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Thu, 17 Apr 2014 15:11:35 +0000 (17 17:11 +0200) | ||
| tree | e856a66186c594f828f64f59b6ffadb8c663ec36 | treesnapshot (tar.gz zip) |
| parent | 53aab23e70e16e872c8a7194b2601f3205aa417d | commitdiff |
| parent | eaaa5c2e48c054a3d6dbfea4ed0bee16c0b78369 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ox-latex.el
Conflicts:
lisp/ox-latex.el
| lisp/ox-latex.el | diff1 | diff2 | blobhistory |