From: Bart Trojanowski <bart@jukie.net>
Date: Fri, 27 Nov 2009 22:49:54 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into vim
X-Git-Tag: 0.1~313^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7a215c2de81e95798ecadd982eecf05e647c3988;p=notmuch.git

Merge remote branch 'origin/master' into vim
---

7a215c2de81e95798ecadd982eecf05e647c3988