Merge branch 'bug698012-rra'
commitf03b980b7ba6ec4b28c9cf64c5e6408acd9d4fec
authorRuss Allbery <rra@debian.org>
Sun, 30 Apr 2017 18:45:56 +0000 (30 11:45 -0700)
committerRuss Allbery <rra@debian.org>
Sun, 30 Apr 2017 18:45:56 +0000 (30 11:45 -0700)
treef964ff50649314a6ae41b4c2d1147c968a217124
parent6081a60052d2a09fbfa970a0cb22a44488c7d8cc
parentd575df9af106f837c3783e5c829abeef60484790
Merge branch 'bug698012-rra'