From: David Bremner <bremner@debian.org>
Date: Fri, 24 Jun 2011 00:54:50 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 0.7_rc1~60
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/68a2c7a8b0f749cb33a8ce7cfa2aa7781d2529bb

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

68a2c7a8b0f749cb33a8ce7cfa2aa7781d2529bb