From: Konrad Scorciapino <konrad@scorciapino.com>
Date: Wed, 23 Mar 2011 19:21:20 +0000 (-0300)
Subject: Merge branch 'master' of git://notmuchmail.org/git/notmuch-wiki
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=e37567f20588e4075b06efd8e29d29f70338ad8c;p=notmuch-wiki

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

e37567f20588e4075b06efd8e29d29f70338ad8c