projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be1169f 94d1b11)
Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 11:06:49 +0000 (12:06 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 31 Jan 2013 11:06:49 +0000 (12:06 +0100)
1  2 
lisp/org-html.el patch | diff1 | diff2 | blob | history

diff --cc lisp/org-html.el
Simple merge
Org-mode, an Emacs mode for organizing your life.