| commit | 4c0a29edecda622e66ce319871312cba5ff48dbf | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Mon, 21 Apr 2014 07:50:10 +0000 (21 09:50 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Mon, 21 Apr 2014 07:50:10 +0000 (21 09:50 +0200) | ||
| tree | 58b472f7581b725df964f63109e6479dcc604aa1 | treesnapshot (tar.gz zip) |
| parent | 3e401117fd09ed80ece5dce02c681b3b37a084a0 | commitdiff |
| parent | b983048b7384fe65088ad0da15496ace41b19e35 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/ox.el
Conflicts:
lisp/ox.el
| doc/org.texi | diff1 | diff2 | blobhistory |
| lisp/ox.el | diff1 | diff2 | blobhistory |