From: Carl Worth <cworth@cworth.org>
Date: Sun, 22 Nov 2009 23:43:26 +0000 (+0100)
Subject: Merge remote branch 'drax/master'
X-Git-Tag: 0.1~363
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=ec738509f291fb6563013cc530d7930cfe6495fb

Merge remote branch 'drax/master'
---

ec738509f291fb6563013cc530d7930cfe6495fb