From: Sebastian Spaeth Date: Mon, 9 Jan 2012 16:25:19 +0000 (+0100) Subject: Merge branch 'master' of ssh://notmuchmail.org/git/notmuch X-Git-Tag: debian/0.12_rc1-1~225 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=980daa26b57bf0285ab740ce49359e29ba898fee Merge branch 'master' of ssh://notmuchmail.org/git/notmuch --- 980daa26b57bf0285ab740ce49359e29ba898fee