| commit | 4b475bcd112797713d5688474d6ceb55d407b744 | |
| author | Carsten Dominik <carsten.dominik@gmail.com> | |
| Mon, 12 Apr 2010 16:45:58 +0000 (12 18:45 +0200) | ||
| committer | Carsten Dominik <carsten.dominik@gmail.com> | |
| Mon, 12 Apr 2010 16:45:58 +0000 (12 18:45 +0200) | ||
| tree | d61e2281612cfd365efbdf0c8174ba1eac559499 | treesnapshot (tar.gz zip) |
| parent | d73dcc4c312bddbe3a53ded039aad7e59a2e991f | commitdiff |
| parent | dfda58d720484124f9432a09d831a9d6292908af | commitdiff |
Merge commit 'jan/org-file-apps-ex'
Conflicts:
lisp/ChangeLog
Conflicts:
lisp/ChangeLog
| lisp/ChangeLog | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |