]> git.donarmstrong.com Git - debian/debian-policy.git/commitdiff
Merge branch 'master' into bug643690-rra
authorRuss Allbery <rra@debian.org>
Sun, 25 Dec 2011 17:34:41 +0000 (09:34 -0800)
committerRuss Allbery <rra@debian.org>
Sun, 25 Dec 2011 17:34:41 +0000 (09:34 -0800)

Trivial merge