Merge branch 'maint'
commit8dc2d7767811f7d754328da0398e49718bd797de
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Nov 2016 00:16:29 +0000 (7 01:16 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Nov 2016 00:16:29 +0000 (7 01:16 +0100)
tree8d54e6f18fb362891e7e8d0e9dabf00347f4bc2d
parent2c0d8774b423e31d20b74c243fd93983b1949946
parent13dbea95af9ee7bd7db4695a384184ad3f537eab
Merge branch 'maint'
doc/org.texi
lisp/org-capture.el