]> git.donarmstrong.com Git - debhelper.git/commit
Merge branch 'master' into buildsystems
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 28 Jun 2009 20:27:53 +0000 (16:27 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 28 Jun 2009 20:27:53 +0000 (16:27 -0400)
commit13e1de542d940506fdad6f14620131310bd8ec11
tree3826ee89d20912718ebe349e97ca60cb9fada288
parentaf351ff3d870c0559afd79fad0341f6a558e3900
parent63a9ae5d8a3af3d8c707187fb7cb55d55533a7df
Merge branch 'master' into buildsystems

Conflicts:
dh_auto_install
Debian/Debhelper/Buildsystem/python_distutils.pm
debian/changelog