From: David Bremner <bremner@debian.org>
Date: Tue, 6 Dec 2011 23:39:33 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.11_rc1~58
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=f0e0053149bb3b51f4a0cd43371292b639f236a8

Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by inserting the 0.10.2 stanza before 0.11
---

f0e0053149bb3b51f4a0cd43371292b639f236a8
diff --cc NEWS
index 2b2f08a6,3f577e42..bb5e4d55
--- a/NEWS
+++ b/NEWS
@@@ -1,16 -1,14 +1,27 @@@
 +Notmuch 0.11 (201x-xx-xx)
 +=========================
 +
 +Performance
 +-----------
 +
 +Automatic tag query optimization
 +
 +  "notmuch tag" now automatically optimizes the user's query to
 +  exclude messages whose tags won't change.  In the past, we've
 +  suggested that people do this by hand; this is no longer necessary.
 +
 +
+ Notmuch 0.10.2 (2011-12-04)
+ ===========================
+ 
+ Bug-fix release.
+ ----------------
+ 
+ Fix crash in python bindings.
+ 
+     The python bindings did not call g_type_init, which caused crashes
+     for some, but not all users.
+ 
  Notmuch 0.10.1 (2011-11-25)
  ===========================