]> git.notmuchmail.org Git - notmuch/commitdiff
Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Sat, 14 Jan 2012 00:52:01 +0000 (20:52 -0400)
committerDavid Bremner <bremner@debian.org>
Sat, 14 Jan 2012 00:52:01 +0000 (20:52 -0400)
Conflicts:
notmuch-reply.c
notmuch.1

1  2 
emacs/notmuch-show.el
test/emacs

Simple merge
diff --cc test/emacs
Simple merge