chiark / gitweb /
Merge branch 'master' of ssh://db.debian.org/git/debian.org
authorPeter Palfrader <peter@palfrader.org>
Sat, 19 Mar 2011 22:30:42 +0000 (23:30 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 19 Mar 2011 22:30:42 +0000 (23:30 +0100)
commit12766839686302757c4b26406a6f5a259267effb
tree20ba316c3f5b63e1c72fc2f3e1f295a0dd2cca40
parentab124f92dc02e04d8b517ac2a92d57141353096b
parentbcf32b8ba794205914b7ae567a64ccbc1edb269a
Merge branch 'master' of ssh://db.debian.org/git/debian.org

* 'master' of ssh://db.debian.org/git/debian.org:
  Added libintl-perl to debian.org-www-master.debian.org

Conflicts:
debian/changelog
debian/changelog
debian/control