Merge branch 'maint'
commitdf53dce91168a5f565fb9d7cfc9761517ca9f979
authorBastien Guerry <bzg@altern.org>
Wed, 21 May 2014 17:47:29 +0000 (21 19:47 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 21 May 2014 17:47:29 +0000 (21 19:47 +0200)
tree0eb00a7cd2869b4321c77b66dc8c3cab765bba2d
parent9347072882f85f486da079d0673938ff15e5659d
parent241286865cb30dd36afc343209a9b5c418863939
Merge branch 'maint'
lisp/org-attach.el