Merge remote branch 'orgmode/master' into merge-candidate
commit99941eada0bbbf898fe960ba5ddbf4c6192f8358
authorJambunathan K <kjambunathan@gmail.com>
Mon, 13 Jun 2011 05:04:16 +0000 (13 10:34 +0530)
committerJambunathan K <kjambunathan@gmail.com>
Mon, 13 Jun 2011 05:04:16 +0000 (13 10:34 +0530)
tree7b86c2ca2d77fa824acea9f55d874cc07696f9eb
parenteffb6ce5b43cc77622d0be5268b2edffd7280925
parentc4737ae48b84308e1ac201531aca392a81529974
Merge remote branch 'orgmode/master' into merge-candidate
lisp/org-html.el