From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Tue, 23 Aug 2011 07:32:30 +0000 (+0200)
Subject: Merge branch 'master' of ssh://notmuchmail.org/git/notmuch
X-Git-Tag: 0.8_rc0~8
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=d143757a54bb3b45b693dbe2414420ebdd0049a7

Merge branch 'master' of ssh://notmuchmail.org/git/notmuch
---

d143757a54bb3b45b693dbe2414420ebdd0049a7