Public Git Hosting - org-mode.git/commit

commit	cb624111af5e8acbd71862329ae1b0c2f2fe6600
author	Carsten Dominik <carsten.dominik@gmail.com>
	Tue, 20 Apr 2010 13:37:18 +0000 (20 15:37 +0200)
committer	Carsten Dominik <carsten.dominik@gmail.com>
	Tue, 20 Apr 2010 13:37:18 +0000 (20 15:37 +0200)
tree	2b8f7efdd1f8edd641083ca87a638d087ed3c7bd	tree \| snapshot (tar.gz zip)
parent	c6ea2a1457f430cbb3eaba56cf2028a457db04e4	commit \| diff
parent	e60353004c6045f525ce56bb0ca183a6c43e647a	commit \| diff

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

Conflicts:
lisp/ChangeLog

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