| commit | 3e699dc0327516db5447fbc49101642350e4873a | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sun, 20 Jan 2013 08:50:32 +0000 (20 09:50 +0100) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Sun, 20 Jan 2013 08:50:32 +0000 (20 09:50 +0100) | ||
| tree | 014fe002e3395fb57019c86d39395e2cd701de88 | treesnapshot (tar.gz zip) |
| parent | 60083a5edb94ec640b1da2a313e1e76403cc6fca | commitdiff |
| parent | 84d2251e57d0922d89640380bac8163bac8e6235 | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org-element.el
Conflicts:
lisp/org-element.el
| lisp/org-element.el | diff1 | diff2 | blobhistory |