Merge branch 'maint'
commit602fca424d9c94bd88d2dcf64d5704a2a5c42139
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 13 Apr 2016 21:48:27 +0000 (13 23:48 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 13 Apr 2016 21:48:27 +0000 (13 23:48 +0200)
tree45458262786dbe9db690838817e4b63eaaa86135
parent2aa7c34bb55d5bc6f9d9fe8fce2f0d7eb978ec70
parent297315c46aa9d49ea3fb1aa36134267e0cb25002
Merge branch 'maint'
lisp/org-capture.el