Merge branch 'maint'
commit2e370ed537c14ce33989d7188dee7d285c0ccd0e
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 21 May 2014 19:30:38 +0000 (21 21:30 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 21 May 2014 19:30:38 +0000 (21 21:30 +0200)
tree335f34237cc90302f1cb79b9963a71def7b59f88
parentdf53dce91168a5f565fb9d7cfc9761517ca9f979
parentbc456879ff7f248371e8571597ece6dcf9239a81
Merge branch 'maint'
lisp/ox-org.el