Public Git Hosting - org-mode.git/commit

commit	07ac15ef72c1a52fccc6e4218a64e2bc63291693
author	Eric Schulte <eric.schulte@gmx.com>
	Wed, 14 Mar 2012 13:56:52 +0000 (14 09:56 -0400)
committer	Eric Schulte <eric.schulte@gmx.com>
	Wed, 14 Mar 2012 13:56:52 +0000 (14 09:56 -0400)
tree	15555e9577a64675dad4b53458c106a6acb654b6	tree \| snapshot (tar.gz zip)
parent	1dd3180480d9cc30f2002409759999c090ff654a	commit \| diff
parent	4542824f2c746baad9f19340c46204a9ec1b00f9	commit \| diff

Merge branch 'origin-maint'

Conflicts:
lisp/org-src.el

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