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

Simple merge