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)
commit0bbfc5ce8be91b881d9542d86aceec7e6a716e86
treec60f3c371c1be649000e314889d233998654a240
parent38546e4acba5593c6ad8b35712475abc27d3a4fd
parentffce9b7c25b9b44ec026b67d96e44cae09c99efe
Merge branch 'release'

Conflicts:
notmuch-reply.c
notmuch.1
emacs/notmuch-show.el
test/emacs