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)
commitad9ca25d869f264f87e76932fc717f5e680de9c2
treed34b9a64b0fb911a6090c5d74a2d7788df87dc37
parentbe1169fac7ad3a8b7b2ed1c38a5d8a0fe4944f7e
parent94d1b1169dc0c25548a8ccb4993ede298d30345c
Merge branch 'maint'
lisp/org-html.el