Merge branch 'maint'
commitd6775b8751e26da195c4d91abc8d8b558d98c59d
authorBastien Guerry <bzg@altern.org>
Fri, 23 May 2014 12:01:45 +0000 (23 14:01 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 23 May 2014 12:01:45 +0000 (23 14:01 +0200)
tree5bef6abc1b34a25d93a5974d4bc7ad96173e8598
parent0f0fa81dd0f2785b62a77a65fc569ebdfb9ba020
parentee5a88cd01cccc7b12422aebe6269bfeb444d387
Merge branch 'maint'
lisp/org-capture.el