Merge branch '0.3.x'

This doesn't pull in any code, (everything in 0.3.x was originally
cherry-picked from master anyway). But the merge does give us a
correct NEWS file showing which fixes are included in 0.3.1 and which
features have been commited "since" then, (topologically, not
chronologically).

diff --cc NEWS
index fc58d935f460119e7f8bc79af1e4d8557ffabdb1,ce0ea452a5b3678320559338df2c6fbc8ed98838..3c8f0b3592a496fa49df106ba2e875f01839a085
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,39 -1,21 +1,39 @@@
- Notmuch 0.3.1 (2010-04-27)
- ==========================
- General bug fix
- ---------------
- Fix an infinite loop in "notmuch reply"
- 
-   This bug could be triggered by replying to a message where the
-   user's primary email address did not appear in the To: header and
-   the user had not configured any secondary email addresses. The bug
-   was a simple re-use of the same iterator variable in nested loops.
- 
- Emacs bug fixes
- ---------------
- Fix calculations for line wrapping in the primary "notmuch" view.
- 
- Fix Fcc support to prompt to create a directory if the specified Fcc
- directory does not exist.
- 
 +New emacs features
 +------------------
 +Add a new, optional hook for detecting inline patches
 +
 +  This hook is disabled by default but can be enabled with a checkbox
 +  under ""Notmuch Show Insert Text/Plain Hook" in the notmuch
 +  customize interface. It allows for inline patches to be detected and
 +  treated as if they were attachments, (with context-sensitive
 +  highlighting).
 +
 +Automatically tag messages as "replied" when sending a reply
 +
 +  This feature adds a "replied" tag by default, but can easily be
 +  customized to add or remove other tags as well. For example, a user
 +  might use a tag of "needs-reply" and can configure this feature to
 +  automatically remove that tag when replying. See "Notmuch Message
 +  Mark Replied" in the notmuch customize interface.
 +
+ Notmuch 0.3.1 (2010-04-27)
+ ==========================
+ General bug fix
+ ---------------
+ Fix an infinite loop in "notmuch reply"
+ 
+   This bug could be triggered by replying to a message where the
+   user's primary email address did not appear in the To: header and
+   the user had not configured any secondary email addresses. The bug
+   was a simple re-use of the same iterator variable in nested loops.
+ 
+ Emacs bug fixes
+ ---------------
+ Fix calculations for line wrapping in the primary "notmuch" view.
+ 
+ Fix Fcc support to prompt to create a directory if the specified Fcc
+ directory does not exist.
+ 
  Build fix
  ---------
  Fix build on OpenSolaris (at least) due to missing 'extern "C"' block.