Merge branch 'maint'master
commitc0fb62dc68c27d3916e7502acbfccf172be7b786
authorBastien <bzg@gnu.org>
Fri, 30 Sep 2016 08:00:57 +0000 (30 10:00 +0200)
committerBastien <bzg@gnu.org>
Fri, 30 Sep 2016 08:00:57 +0000 (30 10:00 +0200)
tree6d519991d7caec756130534ddab4b2f0231a59c6
parentb3c556d83ac5407aa250557d4bec89aef238684f
parentcd5e2d94d8949be6ac1d8d5e20935c25bb4e5f49
Merge branch 'maint'
contrib/lisp/org-notmuch.el