From: David Bremner <bremner@unb.ca>
Date: Fri, 2 Dec 2011 15:59:20 +0000 (-0800)
Subject: Merge branch 'master' of git://notmuchmail.org/git/notmuch-wiki
X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=commitdiff_plain;h=2efbd097cd01eccf8ff914de49535af26f8da303

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

2efbd097cd01eccf8ff914de49535af26f8da303