Fix a bad merge that put incorrect changes in 3.9.7.0
commit27ffaf734aff779fe8a22852a94af732abb1ca29
authorRuss Allbery <rra@debian.org>
Sat, 31 Dec 2016 23:28:41 +0000 (31 15:28 -0800)
committerRuss Allbery <rra@debian.org>
Sat, 31 Dec 2016 23:28:41 +0000 (31 15:28 -0800)
treeb2da6812129fabe556442cbd305430d7f81ac44a
parent72f5e27a95541cbb2d61f1289e105e238bb2ab5a
Fix a bad merge that put incorrect changes in 3.9.7.0

These changes were applied and not released.  They will be part of
the 3.9.9.0 release.
debian/changelog