Merge branch 'master' into bug575639-rra

Conflicts:
	debian/changelog

diff --cc debian/changelog
index fca9cd5664e7ea384904de6cfffbb81960614b60,3dea6a44a2a073884ae59333a661bd6b1b463fff..73a9b56dce1c7371134cdda8dbfe1ba18a1129d6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -68,11 -68,11 +68,16 @@@ debian-policy (3.8.5.0) UNRELEASED; urg
      Seconded: Steve Langasek <vorlon@debian.org>
      Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
      Closes: #555978
+   * Policy: Relax requirement that library dev files be in one package
+     Wording: Russ Allbery <rra@debian.org>
+     Seconded: Julien Cristau <jcristau@debian.org>
+     Seconded: Andrew McMillan <andrew@morphoss.com>
+     Closes: #347581
 +  * Policy: Tighten requirements for maintainer-like fields
 +    Wording: Russ Allbery <rra@debian.org>
 +    Seconded: Emilio Pozuelo Monfort <pochu@debian.org>
 +    Seconded: Andrew McMillan <andrew@morphoss.com>
 +    Closes: #575639
    * Perl Policy: Change perlapi provides to use an ABI version
      Wording: Niko Tyni <ntyni@debian.org>
      Seconded: Russ Allbery <rra@debian.org>

diff --cc policy.sgml
Simple merge

diff --cc upgrading-checklist.sgml
Simple merge