Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Tue, 6 Dec 2011 23:39:33 +0000 (19:39 -0400)
committerDavid Bremner <bremner@debian.org>
Tue, 6 Dec 2011 23:39:33 +0000 (19:39 -0400)
commitf0e0053149bb3b51f4a0cd43371292b639f236a8
treef79945f6c0970190ed80b0d31df8b95bacab38b1
parentc4d824bc1ee4e49c86315cd3e7f0a4756aff3811
parent07bb8b9e895541006eca88430925f1c6524c4708
Merge branch 'release'

Conflicts:
NEWS

Conflicts resolved by inserting the 0.10.2 stanza before 0.11
Makefile.local
NEWS
test/notmuch-test