Public Git Hosting - org-mode.git/commit

commit	ee3cf87d4020721dd012e42fa71f1017d39b7bf1
author	Nicolas Goaziou <n.goaziou@gmail.com>
	Mon, 14 Apr 2014 11:56:05 +0000 (14 13:56 +0200)
committer	Nicolas Goaziou <n.goaziou@gmail.com>
	Mon, 14 Apr 2014 11:56:05 +0000 (14 13:56 +0200)
tree	c61815dcddd350eafa9764bb467f7150a900d565	tree \| snapshot (tar.gz zip)
parent	d34fa17716c98d8a560e66977fc12a7787fc7674	commit \| diff
parent	f61cd6b7a17507dbcbd96a105d6c2e59a5b087b4	commit \| diff

Merge branch 'maint'

Conflicts:
lisp/ox-html.el

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