]> git.donarmstrong.com Git - debian/debian-policy.git/commitdiff
Merge branch 'master' into bug498300-rra
authorRuss Allbery <rra@debian.org>
Fri, 13 Jan 2012 17:21:28 +0000 (09:21 -0800)
committerRuss Allbery <rra@debian.org>
Fri, 13 Jan 2012 17:21:28 +0000 (09:21 -0800)
1  2 
policy.sgml

diff --cc policy.sgml
Simple merge