Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sun, 22 Jun 2014 09:53:21 +0000 (06:53 -0300)
committerDavid Bremner <david@tethera.net>
Sun, 22 Jun 2014 09:53:21 +0000 (06:53 -0300)
Austin's termpos patches and Felipe's zlib.pc workaround


Trivial merge