Merge branch 'maint'
commitdb9d63d3139b92a4aaa39cf7a0fe9baaff7fea08
authorBastien Guerry <bzg@altern.org>
Thu, 29 May 2014 19:21:11 +0000 (29 21:21 +0200)
committerBastien Guerry <bzg@altern.org>
Thu, 29 May 2014 19:21:11 +0000 (29 21:21 +0200)
tree15ca50cb18a202e8f97291d3db7b19f26b0e46e9
parent017e32c4abdee2666e22b5c175aec9f3655b316f
parent34c2365081f6e187b41c54d65db55ab83c78f933
Merge branch 'maint'
lisp/ox-md.el