| commit | a3f58c8891cb82b241b0e3213d5cfc3e60f2e7a4 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Wed, 11 Jun 2014 15:46:40 +0000 (11 17:46 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Wed, 11 Jun 2014 15:46:40 +0000 (11 17:46 +0200) | ||
| tree | ea605f39277bd4101f3eff297c3cc224b8efb873 | treesnapshot (tar.gz zip) |
| parent | 9c57eec531773739fd5fef695f01a644f0ba08ad | commitdiff |
| parent | 6c9b3ad91f6d3758471d194b75cbbf7a1030e18b | commitdiff |
Merge branch 'maint'
Conflicts:
lisp/org.el
Conflicts:
lisp/org.el
| lisp/org-mobile.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |