chiark / gitweb /
Merge remote branch 'pkern/master'
authorPeter Palfrader <peter@palfrader.org>
Tue, 9 Aug 2011 08:02:44 +0000 (10:02 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 9 Aug 2011 08:02:44 +0000 (10:02 +0200)
* pkern/master:
  release.debian.org: drop clasp, add openjdk-6-jre-headless


Trivial merge