From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sun, 15 Apr 2012 05:04:13 +0000 (-0700)
Subject: Merge branch 'master' of git://notmuchmail.org/git/notmuch-wiki
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=af8e2084e8bb1091169c00ed95dd9f0224d21078;p=obsolete%2Fnotmuch-wiki

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

af8e2084e8bb1091169c00ed95dd9f0224d21078