Merge tag 'upstream/1.6.18.3' into debian
commitb900536389c251aa9f9e2fb219ce0dc922542e79
authorAnders Kaseorg <andersk@mit.edu>
Wed, 3 Aug 2016 20:54:27 +0000 (3 16:54 -0400)
committerAnders Kaseorg <andersk@mit.edu>
Wed, 3 Aug 2016 20:54:27 +0000 (3 16:54 -0400)
tree6c58b3c8fcfb259418fa9f2cd36cc8c3ba13ce38
parent4f37890135ee917a6712fce85a2e19f4abb1ba71
parente2ecfbbaf411793437afcac29f33be9248cd9cef
Merge tag 'upstream/1.6.18.3' into debian

Upstream version 1.6.18.3