Merge branch 'maint' master
authorBastien <bzg@gnu.org>
Tue, 21 Feb 2017 14:42:12 +0000 (15:42 +0100)
committerBastien <bzg@gnu.org>
Tue, 21 Feb 2017 14:42:12 +0000 (15:42 +0100)
commitcfadbc3761aba357ba612a5bc93b8377d368ae8e
tree19037fd85acc4579dd50af6404fc95a263ad3e72
parentf5722944575dc83b1e12c730b2887c584fd523d7
parentdf506794db4ab026a4525772de92b8bd33ef6271
Merge branch 'maint'
lisp/org-capture.el