From: David Bremner <david@tethera.net>
Date: Sat, 15 Aug 2015 08:45:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/master'
X-Git-Url: https://git.cworth.org/git?p=notmuch-wiki;a=commitdiff_plain;h=a07a0cc03bdae9245d1f59e50343f9d010cc83a4

Merge remote-tracking branch 'refs/remotes/origin/master'
---

a07a0cc03bdae9245d1f59e50343f9d010cc83a4