diff options
| author |  David Bremner <bremner@debian.org> | 2012-01-13 20:52:01 -0400 |
|---|---|---|
| committer | David Bremner <bremner@debian.org> | 2012-01-13 20:52:01 -0400 |
| commit | 0bbfc5ce8be91b881d9542d86aceec7e6a716e86 (patch) | |
| tree | c60f3c371c1be649000e314889d233998654a240 /.dir-locals.el | |
| parent | 38546e4acba5593c6ad8b35712475abc27d3a4fd (diff) | |
| parent | ffce9b7c25b9b44ec026b67d96e44cae09c99efe (diff) | |
Merge branch 'release'
Conflicts:
notmuch-reply.c
notmuch.1
Diffstat (limited to '.dir-locals.el')
0 files changed, 0 insertions, 0 deletions