Merge branch 'maint'
commitd55f0632b5c05ad0521e380d2ef89c631af74d84
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 15 Dec 2013 15:18:31 +0000 (15 16:18 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 15 Dec 2013 15:18:31 +0000 (15 16:18 +0100)
treee5fe78d56546bdd13bc46e9d98f5edbab0d29602
parent4e02e48fa3ca7a9ec365516ee511bfdad0c0190d
parentf1b9339aa5f10f8367469cabba59251bd01bdf28
Merge branch 'maint'
lisp/org-element.el
lisp/ox-org.el