From: martin f. krafft <madduck@debian.org>
Date: Thu, 21 Jan 2010 00:58:55 +0000 (+1300)
Subject: Merge branch 'upstream'
X-Git-Tag: debian-0.1-1~19^2~13
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=0ea5f3fc0e0336921ba670a28201b59d2c977cfb

Merge branch 'upstream'
---

0ea5f3fc0e0336921ba670a28201b59d2c977cfb