]> git.donarmstrong.com Git - debhelper.git/commit
Merge branch 'wheezy' master
authorJoey Hess <joey@kitenet.net>
Mon, 10 Sep 2012 17:11:32 +0000 (13:11 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 10 Sep 2012 17:11:32 +0000 (13:11 -0400)
commitcdb8852a4b1ef3e83f5f9fdc60285c015a38c0e1
tree434ce410b4ec1ae57a0172684997e1d0cfef056a
parent073034791eea9df519a06deb4058908e30d0fa7d
parentd27f02705863d955be3d15410919a9faa2eb3ab0
Merge branch 'wheezy'

Conflicts:
man/po4a/po/de.po
debian/changelog