Merge branch 'maint'
commit8e44533339f104213a1252c84de8a54c35c52e2a
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 9 Sep 2012 12:14:54 +0000 (9 14:14 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 9 Sep 2012 12:14:54 +0000 (9 14:14 +0200)
treed119292b7cc662f5babd8357d9741d362608b884
parent830a0781a6903bf83937a20aa43fe92027833ce6
parentf29131c3d2581a3089a5862dd84eb6cb435d2e45
Merge branch 'maint'
lisp/org-element.el
lisp/org.el