Merge branch 'master' into bug498300-rra
commitbec143010dd02798dbb7b6fa26d754a476cf0166
authorRuss Allbery <rra@debian.org>
Fri, 13 Jan 2012 17:21:28 +0000 (13 09:21 -0800)
committerRuss Allbery <rra@debian.org>
Fri, 13 Jan 2012 17:21:28 +0000 (13 09:21 -0800)
tree12395cbb01e1509fe28252f53fe373bc58de1dde
parentf39fe9d4bc04304a4f7f561169892faa4a4f6c5e
parent8ab221980caeb0fdfbf1db8f449c22cbbec30e68
Merge branch 'master' into bug498300-rra
policy.sgml