Merge branch 'maint'
commitd5a603db1f7b2f59e7a635649ede12aac68cf63f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Mar 2016 08:54:52 +0000 (10 09:54 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 10 Mar 2016 08:54:52 +0000 (10 09:54 +0100)
tree80291d6c34eec1676f262eaaf655d291c791ab23
parentb43898a2377dd82489248326d86194352d47f36b
parentcb5f323b0d7982cd2dee1d21624566e5c71189e2
Merge branch 'maint'
lisp/org-crypt.el