chiark / gitweb /
~ianmdlvl / dsa-metapackages.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2990edd 5759f40)
Merge branch 'master' of http://kosh.ganneff.de/~joerg/debian.org
authorPeter Palfrader <peter@palfrader.org>
Sun, 28 Feb 2010 16:22:16 +0000 (17:22 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 28 Feb 2010 16:22:16 +0000 (17:22 +0100)
commit427c0aa36c6849fa5a83658b65c6a9c727a27da9
tree3d746f5a13a6e972eaa8ab3644b218dc1a1171aatree | snapshot
parent2990edd1c07d4b080f17068b3e25517ae4105c1dcommit | diff
parent5759f409a5de57b913bceaa7cb8bc9591b466b89commit | diff
Merge branch 'master' of kosh.ganneff.de/~joerg/debian.org

* 'master' of http://kosh.ganneff.de/~joerg/debian.org:
  Add a changelog entry
  python instead of python2.4.
  editor extensions are unwanted
  mc is already in -recommends
  No more gpgv
  Fixup apt-utils depends
  Add a first version for an ftpmaster.d.o metapackage
  Update the planet.debian.org metapackage

Conflicts:

debian/changelog
debian/changelog diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.