Merge branch 'maint'
commit4f8d40dc33b2ce8c4d55453ac56aa6d86e98126e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 23 Aug 2015 20:46:29 +0000 (23 22:46 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 23 Aug 2015 20:46:29 +0000 (23 22:46 +0200)
treed7ebd528bf77c70909fb980d4572283d4fd74506
parent9a792523d65677825e497c5345ab321af3f20d4f
parent9c5588377f2b954e389f0da70c1dcc5afffdb96a
Merge branch 'maint'
lisp/org.el