Merge tag 'upstream/1.6.18.1' into debian
commitb46acac650bca574330731b6162e870b1224f0cb
authorAnders Kaseorg <andersk@mit.edu>
Sun, 26 Jun 2016 22:31:25 +0000 (26 18:31 -0400)
committerAnders Kaseorg <andersk@mit.edu>
Sun, 26 Jun 2016 22:31:25 +0000 (26 18:31 -0400)
tree83ddd4bbfa42e12c873bf797bede78fb5590d8aa
parentee889090ddfa7c3dc24a6c53e5985733fd14a3c0
parente64a59238164b88838e89f2a47982159b0fa1111
Merge tag 'upstream/1.6.18.1' into debian

Upstream version 1.6.18.1