chiark / gitweb /
Merge remote branch 'adsb/master'
authorPeter Palfrader <peter@palfrader.org>
Sat, 26 Nov 2011 15:41:54 +0000 (16:41 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 26 Nov 2011 15:41:54 +0000 (16:41 +0100)
commitadd4683eb27ce0ed08df2dc365dbb75ccd416126
tree036005ad89aa6e05bd650b396753fd65778555c4
parentb5b7ff06e4dfac905a4fc04ca15132389e30dc41
parent22d702e287352b43add8d8a8f729a1c8cc02af0b
Merge remote branch 'adsb/master'

* adsb/master:
  release.debian.org: replace python2.5{,-dev} with their 2.6 equivalents

Signed-off-by: Peter Palfrader <peter@palfrader.org>