| commit | 317efee93be3a776e67ac87dbe05867e028956f5 | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Tue, 3 Dec 2013 20:02:48 +0000 (3 21:02 +0100) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Tue, 3 Dec 2013 20:02:48 +0000 (3 21:02 +0100) | ||
| tree | cef234cad988dd6a7db34a1cd7f0f5880aa445d3 | treesnapshot (tar.gz zip) |
| parent | f9a73edc2438d7bace8e72fe28a38f526c387ca6 | commitdiff |
| parent | 8953b417f205752aa4548a74518e16b2b54330ca | commitdiff |
Merge branch 'maint'
Conflicts:
contrib/lisp/org-drill.el
Conflicts:
contrib/lisp/org-drill.el
| lisp/ox-html.el | diff1 | diff2 | blobhistory |