Merge branch 'maint'
commit9a7bf6d6496a4415ca33b92941e4dbc2c4676855
authorRasmus <rasmus@gmx.us>
Sun, 22 May 2016 13:31:27 +0000 (22 15:31 +0200)
committerRasmus <rasmus@gmx.us>
Sun, 22 May 2016 13:31:27 +0000 (22 15:31 +0200)
treed208565e4916a5ba4a6344fd65990842343b0120
parent2ed5e64a74775fffe4c158de6e5bb96825b5a0e1
parentd07fafed4af9d22044870ae909f0bb82b1412eb6
Merge branch 'maint'
lisp/ox-html.el