Merge branch 'maint'
commitae767704fff29216b426d1f9b7c36a5710edbc3d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 10 Feb 2016 23:49:59 +0000 (11 00:49 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 10 Feb 2016 23:49:59 +0000 (11 00:49 +0100)
tree9c03f8d6acb172d4218a3cb90f13a53901f22fb4
parent94dfa7fa9c4d1cb3ba943214ac9698bbe2627f10
parent6e88bf07d1f23cf59038744f620fb3056cf0dd63
Merge branch 'maint'
lisp/org-archive.el