From: William Morgan <wmorgan-sup@masanjin.net>
Date: Fri, 7 Aug 2009 01:36:36 +0000 (-0400)
Subject: Merge branch 'locking-refactor' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=aa376045168807fbba1349165f9091f3451a07ff;p=sup

Merge branch 'locking-refactor' into next
---

aa376045168807fbba1349165f9091f3451a07ff