Merge branch 'maint'
commitdef5cd8ca5f0eb98ac312c7a5bfcd84bc8563681
authorNicolas Goaziou <n.goaziou@gmail.com>
Fri, 7 Feb 2014 19:08:29 +0000 (7 20:08 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Fri, 7 Feb 2014 19:08:29 +0000 (7 20:08 +0100)
tree7f66dea3aa14d6c3ce708570225253f3c7449c03
parent6a388c135f1336315ce7c54cfb0992aa1bfd5096
parent7f287d1b6277b5588fb7aa375411e46dac52885c
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el