Merge branch 'maint'
commit99580828e6116aa3d9159ced90d4788fa9012bea
authorBastien Guerry <bzg@altern.org>
Fri, 23 May 2014 19:51:23 +0000 (23 21:51 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 23 May 2014 19:51:23 +0000 (23 21:51 +0200)
tree76bc857f75e2677a879650d8ea3ab612bb42223f
parentd978a9e585f94e1e9523243aeb96bb943e77c483
parent942a95cd59c18eb3036d393e7759f86670cae507
Merge branch 'maint'
lisp/org-capture.el