]> git.donarmstrong.com Git - debhelper.git/commit
Merge branch 'master' into buildsystems
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 14 May 2009 18:25:07 +0000 (14:25 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Thu, 14 May 2009 18:25:07 +0000 (14:25 -0400)
commit692ac0f0d2b7acc570cd6a5f8cac848109daf026
tree595da5b949e88f2e05c44cf755f007dc5bdc2465
parent9803d8bb635132458142416d32273c9c754b2aca
parent61aa7954cd6c8620ca99a0d7895aa5a6f59d37e0
Merge branch 'master' into buildsystems

Conflicts:
debian/changelog
dh_auto_configure
Debian/Debhelper/Buildsystem/perl_makemaker.pm
Debian/Debhelper/Dh_Lib.pm
debian/changelog