]> git.donarmstrong.com Git - debian/debian-policy.git/commit
Merge branch 'master' into bug575639-rra
authorRuss Allbery <rra@debian.org>
Mon, 14 Jun 2010 19:37:45 +0000 (12:37 -0700)
committerRuss Allbery <rra@debian.org>
Mon, 14 Jun 2010 19:37:45 +0000 (12:37 -0700)
commit5fbce1fd6720b25fa4ec574573bf635a5ed0ba8d
tree2860e6e27ffd25e520998380e040dc24f7f833ce
parent014240abc0f58945c74fa0595ddc13a6b95c3c48
parentf0c945ea30b4a13fbfab99b02cf4a4232297fc8f
Merge branch 'master' into bug575639-rra

Conflicts:
debian/changelog
debian/changelog
policy.sgml
upgrading-checklist.sgml