From: David Bremner <david@tethera.net>
Date: Sun, 22 Jun 2014 09:53:21 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: address-command-v2~154
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/cc2722ba9e1b2854c5500eb7bb41910478aa8fce

Merge branch 'release'

Austin's termpos patches and Felipe's zlib.pc workaround
---

cc2722ba9e1b2854c5500eb7bb41910478aa8fce