Public Git Hosting - org-mode.git/commit

commit	503ce14912beef2e754885e1222d7de19818f2c2
author	Carsten Dominik <carsten.dominik@gmail.com>
	Tue, 1 Apr 2008 07:24:46 +0000 (1 09:24 +0200)
committer	Carsten Dominik <carsten.dominik@gmail.com>
	Tue, 1 Apr 2008 07:24:46 +0000 (1 09:24 +0200)
tree	40d4680c04f80a6c462f8bec8fb97db1cc4c4752	tree \| snapshot (tar.gz zip)
parent	1aec2e86a54d4865d82b1e35fbe5b1ca7c288d62	commit \| diff
parent	ff7c35f344ef01fc9acb270d0e3a2a2a94d15c32	commit \| diff

Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:

ChangeLog

Org-mode, an Emacs mode for organizing your life.