| commit | fcff45bc358a548ea65255f4cd7a996860ff7912 | |
| author | Carsten Dominik <carsten.dominik@gmail.com> | |
| Fri, 26 Sep 2008 16:28:45 +0000 (26 18:28 +0200) | ||
| committer | Carsten Dominik <carsten.dominik@gmail.com> | |
| Fri, 26 Sep 2008 16:28:45 +0000 (26 18:28 +0200) | ||
| tree | 3d324050b033be34a2c99a463af2e5febe56734c | treesnapshot (tar.gz zip) |
| parent | b1e7ec501039e351e7363cee99a16129b0b8caf2 | commitdiff |
| parent | 0e0f5bba8cc862a43850316372205ef15455d155 | commitdiff |
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
Conflicts:
lisp/ChangeLog
Conflicts:
lisp/ChangeLog
| lisp/ChangeLog | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |