From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Sat, 1 Dec 2012 10:08:33 +0000 (+0000)
Subject: Merge branch 'master' into trim-auto
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=77373c35010d89e5ab3f030e4c60f8f6e3fdbe82;p=apitrace

Merge branch 'master' into trim-auto
---

77373c35010d89e5ab3f030e4c60f8f6e3fdbe82