Public Git Hosting - org-mode.git/commit

commit	f26330fdc545564dfa08fc38a81050c5881ee153
author	Carsten Dominik <carsten.dominik@gmail.com>
	Mon, 22 Sep 2008 08:02:14 +0000 (22 10:02 +0200)
committer	Carsten Dominik <carsten.dominik@gmail.com>
	Mon, 22 Sep 2008 08:02:14 +0000 (22 10:02 +0200)
tree	4de34a5882fa9cc756850913d7468252b46a7042	tree \| snapshot (tar.gz zip)
parent	a8741db759498a80753b7a8de5ef3d02800cbfe2	commit \| diff
parent	a8a499ed2d99627396f3afd2645b1b51f9d355bd	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.