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)
commitcc2722ba9e1b2854c5500eb7bb41910478aa8fce
tree7130e8abf64aae7e133c262c0079ab2afafda9a1
parent9e7bc02530caf94f2eff633129b089d4be26f58a
parent0c698ef0374b671d3b6a8def2d9c113797ceaec3
Merge branch 'release'

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