Merge branch 'master' into bug23712-rra
commit46717f4d249954ae24158bcb7fbd47338633b094
authorRuss Allbery <rra@debian.org>
Wed, 6 Apr 2011 08:12:33 +0000 (6 01:12 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 6 Apr 2011 08:12:33 +0000 (6 01:12 -0700)
treedfa12836a40698d5e24e8bb17faa8495c9eca8b5
parent734706ce3846ece2b4957178ad60e29f8cbe7454
parentfa4adffdd5474d4cdfbde9483fbfced3a9d07a30
Merge branch 'master' into bug23712-rra
policy.sgml