From: Carl Worth <cworth@cworth.org>
Date: Tue, 27 Apr 2010 18:40:26 +0000 (-0700)
Subject: Merge branch '0.3.x'
X-Git-Tag: 0.4~153
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=229292a4b25cc776349ab1c461392a69301733c7;hp=229292a4b25cc776349ab1c461392a69301733c7

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).
---