Merge branch 'maint'
commit5f217e6fd59a384a15ae7ccff896b639b6b6e6fb
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 11:59:10 +0000 (21 13:59 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 11:59:10 +0000 (21 13:59 +0200)
tree1ff608600b09306cef3d869872119706c275e96c
parentfa0876fe2ef4b4dfc5101e4a86a1a6e5fc81f6b3
parentdaa8e23175b5ac7d1ef2d6b67b04d6f4447fb490
Merge branch 'maint'
lisp/org.el