| commit | cd053cc12f9c76862da37ad651e46ca3ac99f5c6 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sat, 21 Apr 2012 14:05:22 +0000 (21 16:05 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sat, 21 Apr 2012 14:05:22 +0000 (21 16:05 +0200) | ||
| tree | fa83e109d63a0c81254dc01272ff545f2a0d27d9 | treesnapshot (tar.gz zip) |
| parent | 58bef074a7937888a39594a5299575e15684cd16 | commitdiff |
| parent | 9d01202a7b87cb9ce33208b14cf129ae26690266 | commitdiff |
Merge branch 'maint' into master-merge-maint
Conflicts:
lisp/org-footnote.el
lisp/org.el
Conflicts:
lisp/org-footnote.el
lisp/org.el
| lisp/org-ctags.el | diff1 | diff2 | blobhistory |
| lisp/org-protocol.el | diff1 | diff2 | blobhistory |