From: Carl Worth <cworth@cworth.org>
Date: Mon, 25 Apr 2011 21:26:42 +0000 (-0700)
Subject: Merge remote-tracking branch 'amdragon/eager-metadata-v4'
X-Git-Tag: debian/0.6_254~169
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df91c16943aa4f5c47452fa7d21e65df2d9e315b;p=notmuch.git

Merge remote-tracking branch 'amdragon/eager-metadata-v4'
---

df91c16943aa4f5c47452fa7d21e65df2d9e315b