| commit | 38ac0d8b565703bfacd0e57572144dae0e1b9b8d | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Tue, 3 Jun 2014 20:13:31 +0000 (3 22:13 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Tue, 3 Jun 2014 20:13:31 +0000 (3 22:13 +0200) | ||
| tree | df7050d7f32048ab02f3953aa1b5fae4d07a9082 | treesnapshot (tar.gz zip) |
| parent | a5c8635fb8cc2c8448ebfdf15f274868382d8120 | commitdiff |
| parent | 0fbc4893eda461d36bd57a670e7e4fee7f9d3a37 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ox.el
Conflicts:
lisp/ox.el
| lisp/ox.el | diff1 | diff2 | blobhistory |